PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #4061 from matrix-org/travis/fix-settings-handling

Browse source 
Check for null config settings a bit safer
This commit is contained in:
Travis Ralston 2020-02-12 10:04:26 -07:00 committed by GitHub
commit b514f89594
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/settings/handlers/ConfigSettingsHandler.js
View file

@ -17,6 +17,7 @@ limitations under the License.
import SettingsHandler from "./SettingsHandler"; import SettingsHandler from "./SettingsHandler";
import SdkConfig from "../../SdkConfig"; import SdkConfig from "../../SdkConfig";
import {isNullOrUndefined} from "matrix-js-sdk/src/utils";
/** /**
* Gets and sets settings at the "config" level. This handler does not make use of the * Gets and sets settings at the "config" level. This handler does not make use of the
@ -32,7 +33,7 @@ export default class ConfigSettingsHandler extends SettingsHandler {
} }
const settingsConfig = config["settingDefaults"]; const settingsConfig = config["settingDefaults"];
if (!settingsConfig || !settingsConfig[settingName]) return null; if (!settingsConfig || isNullOrUndefined(settingsConfig[settingName])) return null;
return settingsConfig[settingName]; return settingsConfig[settingName];
} }