Merge pull request #4988 from bsclifton/fix-default-setting

Fix default setting behavior for getSetting()
brave · Oct 20, 2016 · 92b3485 · 92b3485
2 parents 8a174b5 + e867f41
commit 92b3485
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/js/constants/settings.js b/js/constants/settings.js
@@ -68,7 +68,7 @@ const settings = {
   ONE_PASSWORD_ENABLED: 'security.passwords.one-password-enabled',
   DASHLANE_ENABLED: 'security.passwords.dashlane-enabled',
   LAST_PASS_ENABLED: 'security.passwords.last-pass-enabled',
-  // > phased out with 0.12.5
+  // > phased out with 0.12.6
   SHOW_BOOKMARKS_TOOLBAR_FAVICON: 'bookmarks.toolbar.showFavicon',
   SHOW_BOOKMARKS_TOOLBAR_ONLY_FAVICON: 'bookmarks.toolbar.showOnlyFavicon'
 }

diff --git a/js/settings.js b/js/settings.js
@@ -60,7 +60,7 @@ const resolveValue = (settingKey, settingsCollection) => {
 
 module.exports.getSetting = (settingKey, settingsCollection) => {
   const setting = resolveValue(settingKey, settingsCollection)
-  if (typeof setting !== 'undefined') return setting
+  if (typeof setting !== 'undefined' && setting !== null) return setting
   return getDefaultSetting(settingKey, settingsCollection)
 }