summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-08-07 14:11:20 -0400
committerMoonchild <moonchild@palemoon.org>2020-08-07 21:30:03 +0000
commit3cf08436797f0317064c950bdeedb0fef83e8832 (patch)
treeae3881d2dc7a7d36e653eef06a8f6039138939d2 /toolkit
parentff21776616586562ab8c24f3180fff9901574038 (diff)
downloadUXP-3cf08436797f0317064c950bdeedb0fef83e8832.tar
UXP-3cf08436797f0317064c950bdeedb0fef83e8832.tar.gz
UXP-3cf08436797f0317064c950bdeedb0fef83e8832.tar.lz
UXP-3cf08436797f0317064c950bdeedb0fef83e8832.tar.xz
UXP-3cf08436797f0317064c950bdeedb0fef83e8832.zip
Issue #1628 - Remove redundant PREF_EM_UPDATE_BACKGROUND_URL
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/mozapps/extensions/AddonManager.jsm1
-rw-r--r--toolkit/mozapps/extensions/internal/XPIProvider.jsm8
2 files changed, 1 insertions, 8 deletions
diff --git a/toolkit/mozapps/extensions/AddonManager.jsm b/toolkit/mozapps/extensions/AddonManager.jsm
index a48e0034f..f69daa0eb 100644
--- a/toolkit/mozapps/extensions/AddonManager.jsm
+++ b/toolkit/mozapps/extensions/AddonManager.jsm
@@ -30,7 +30,6 @@ const PREF_EM_LAST_PLATFORM_VERSION = "extensions.lastPlatformVersion";
const PREF_EM_AUTOUPDATE_DEFAULT = "extensions.update.autoUpdateDefault";
const PREF_EM_STRICT_COMPATIBILITY = "extensions.strictCompatibility";
const PREF_EM_CHECK_UPDATE_SECURITY = "extensions.checkUpdateSecurity";
-const PREF_EM_UPDATE_BACKGROUND_URL = "extensions.update.background.url";
const PREF_APP_UPDATE_ENABLED = "app.update.enabled";
const PREF_APP_UPDATE_AUTO = "app.update.auto";
const PREF_MATCH_OS_LOCALE = "intl.locale.matchOS";
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 58d412d9c..f7d53812a 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -74,7 +74,6 @@ const PREF_DSS_SWITCHPENDING = "extensions.dss.switchPending";
const PREF_DSS_SKIN_TO_SELECT = "extensions.lastSelectedSkin";
const PREF_GENERAL_SKINS_SELECTEDSKIN = "general.skins.selectedSkin";
const PREF_EM_UPDATE_URL = "extensions.update.url";
-const PREF_EM_UPDATE_BACKGROUND_URL = "extensions.update.background.url";
const PREF_EM_ENABLED_ADDONS = "extensions.enabledAddons";
const PREF_EM_EXTENSION_FORMAT = "extensions.";
const PREF_EM_ENABLED_SCOPES = "extensions.enabledScopes";
@@ -6179,12 +6178,7 @@ function UpdateChecker(aAddon, aListener, aReason, aAppVersion, aPlatformVersion
let updateURL = aAddon.updateURL;
if (!updateURL) {
- if (aReason == AddonManager.UPDATE_WHEN_PERIODIC_UPDATE &&
- Services.prefs.getPrefType(PREF_EM_UPDATE_BACKGROUND_URL) == Services.prefs.PREF_STRING) {
- updateURL = Services.prefs.getCharPref(PREF_EM_UPDATE_BACKGROUND_URL);
- } else {
- updateURL = Services.prefs.getCharPref(PREF_EM_UPDATE_URL);
- }
+ updateURL = Services.prefs.getCharPref(PREF_EM_UPDATE_URL);
}
const UPDATE_TYPE_COMPATIBILITY = 32;