diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-08-07 14:11:20 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-08-07 14:11:20 -0400 |
| commit | d357eec5671c8636f8f2ee1beeecd57aa3b16030 (patch) | |
| tree | 3f64a6b24da353ff0c269a0930ff6c143f5d6bba /toolkit | |
| parent | 267d32f4f3360bb583486391d3d9cb620458c5f0 (diff) | |
| download | UXP-d357eec5671c8636f8f2ee1beeecd57aa3b16030.tar UXP-d357eec5671c8636f8f2ee1beeecd57aa3b16030.tar.gz UXP-d357eec5671c8636f8f2ee1beeecd57aa3b16030.tar.lz UXP-d357eec5671c8636f8f2ee1beeecd57aa3b16030.tar.xz UXP-d357eec5671c8636f8f2ee1beeecd57aa3b16030.zip | |
Issue #1628 - Remove redundant PREF_EM_UPDATE_BACKGROUND_URL
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/mozapps/extensions/AddonManager.jsm | 1 | ||||
| -rw-r--r-- | toolkit/mozapps/extensions/internal/XPIProvider.jsm | 8 |
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; |