[AllAM] Effectively revert Bug 521905 - Make extensions.checkCompatibility be per-application-version

This commit is contained in:
NTD 2018-06-25 11:10:36 -04:00 committed by Roy Tam
commit 33278f1ab9
2 changed files with 2 additions and 14 deletions

View file

@ -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) {}

View file

@ -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) {}