diff options
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/mozapps/extensions/AddonManager.jsm | 6 | ||||
| -rw-r--r-- | toolkit/mozapps/webextensions/AddonManager.jsm | 10 |
2 files changed, 2 insertions, 14 deletions
diff --git a/toolkit/mozapps/extensions/AddonManager.jsm b/toolkit/mozapps/extensions/AddonManager.jsm index d4c3a6967..29cf74749 100644 --- a/toolkit/mozapps/extensions/AddonManager.jsm +++ b/toolkit/mozapps/extensions/AddonManager.jsm @@ -47,8 +47,7 @@ const KEY_APPDIR = "XCurProcD"; const FILE_BLOCKLIST = "blocklist.xml"; const BRANCH_REGEXP = /^([^\.]+\.[0-9]+[a-z]*).*/gi; -const PREF_EM_CHECK_COMPATIBILITY_BASE = "extensions.checkCompatibility"; -var PREF_EM_CHECK_COMPATIBILITY; +const PREF_EM_CHECK_COMPATIBILITY = "extensions.checkCompatibility"; const TOOLKIT_ID = "toolkit@mozilla.org"; @@ -809,9 +808,6 @@ var AddonManagerInternal = { this.validateBlocklist(); } - PREF_EM_CHECK_COMPATIBILITY = PREF_EM_CHECK_COMPATIBILITY_BASE + "." + - Services.appinfo.version.replace(BRANCH_REGEXP, "$1"); - try { gCheckCompatibility = Services.prefs.getBoolPref(PREF_EM_CHECK_COMPATIBILITY); } catch (e) {} diff --git a/toolkit/mozapps/webextensions/AddonManager.jsm b/toolkit/mozapps/webextensions/AddonManager.jsm index c5cb80091..9aa2b8e7b 100644 --- a/toolkit/mozapps/webextensions/AddonManager.jsm +++ b/toolkit/mozapps/webextensions/AddonManager.jsm @@ -58,10 +58,7 @@ const KEY_APPDIR = "XCurProcD"; const FILE_BLOCKLIST = "blocklist.xml"; const BRANCH_REGEXP = /^([^\.]+\.[0-9]+[a-z]*).*/gi; -const PREF_EM_CHECK_COMPATIBILITY_BASE = "extensions.checkCompatibility"; -var PREF_EM_CHECK_COMPATIBILITY = MOZ_COMPATIBILITY_NIGHTLY ? - PREF_EM_CHECK_COMPATIBILITY_BASE + ".nightly" : - undefined; +const PREF_EM_CHECK_COMPATIBILITY = "extensions.checkCompatibility"; const TOOLKIT_ID = "toolkit@mozilla.org"; @@ -870,11 +867,6 @@ var AddonManagerInternal = { this.validateBlocklist(); } - if (!MOZ_COMPATIBILITY_NIGHTLY) { - PREF_EM_CHECK_COMPATIBILITY = PREF_EM_CHECK_COMPATIBILITY_BASE + "." + - Services.appinfo.version.replace(BRANCH_REGEXP, "$1"); - } - try { gCheckCompatibility = Services.prefs.getBoolPref(PREF_EM_CHECK_COMPATIBILITY); } catch (e) {} |