summaryrefslogtreecommitdiff
path: root/lib/config
diff options
context:
space:
mode:
authorSheogorath2018-03-26 20:49:24 +0200
committerSheogorath2018-03-26 20:49:37 +0200
commit10a81e7db247ae70f589c6008d0c99da3881201c (patch)
tree1f5679e28c42bb92194b001e38581d13b8be825c /lib/config
parent4eef661c15d750bb19a1673760ce35330a26091c (diff)
Fix logical error in legacy config expression
We should check for an undefined and not just for a logical true or false. Example: When `usecdn` was set to false it was impossible to overwrite the new config value because the if statement becomes false. Thanks @davidmehren for pointing me to this issue. Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
Diffstat (limited to 'lib/config')
-rw-r--r--lib/config/index.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/config/index.js b/lib/config/index.js
index fae51e52..cc71564b 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -110,8 +110,8 @@ for (let i = keys.length; i--;) {
// and the config with uppercase is not set
// we set the new config using the old key.
if (uppercase.test(keys[i]) &&
- config[lowercaseKey] &&
- !config[keys[1]]) {
+ config[lowercaseKey] !== undefined &&
+ fileConfig[keys[i]] === undefined) {
logger.warn('config.js contains deprecated lowercase setting for ' + keys[i] + '. Please change your config.js file to replace ' + lowercaseKey + ' with ' + keys[i])
config[keys[i]] = config[lowercaseKey]
}