Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 335238 - update requests for disabled extensions should have some 'disabled' indicator in the request. patch=Dave Townsend (Mossop), r=rob_strong

Browse Source
This commit is contained in:
rob_strong%exchangecode.com 2006-06-20 01:03:01 +00:00
parent f552f1c839
commit cf777e0989
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/locales/en-US/chrome/mozapps/extensions/extensions.properties
View File

@ -32,7 +32,7 @@ disableTitle=Disable %S
disableWarningDependMessage=If you disable %S, the following items that require this extension will also be disabled:
disableQueryMessage=Do you want to disable %S?
extensions.update.url=https://addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%
extensions.update.url=https://addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%
extensions.getMoreExtensionsURL=https://addons.mozilla.org/extensions/?application=%APPID%
extensions.getMoreThemesURL=https://addons.mozilla.org/themes/?application=%APPID%

15
toolkit/mozapps/extensions/src/nsExtensionManager.js.in
View File

@ -6078,6 +6078,20 @@ RDFItemUpdater.prototype = {
this._versionUpdateOnly = aVersionUpdateOnly;
this._item = aItem;
var itemStatus;
if (emDS.getItemProperty(aItem.id, "userDisabled") == "true" ||
emDS.getItemProperty(aItem.id, "userDisabled") == OP_NEEDS_ENABLE)
itemStatus = "userDisabled";
else
itemStatus = "userEnabled";
if (emDS.getItemProperty(aItem.id, "compatible") == "false")
itemStatus += ",incompatible";
if (emDS.getItemProperty(aItem.id, "blocklisted") == "true")
itemStatus += ",blocklisted";
if (emDS.getItemProperty(aItem.id, "satisfiesDependencies") == "false")
itemStatus += ",needsDependencies";
// Look for a custom update URI: 1) supplied by a pref, 2) supplied by the
// install manifest, 3) the default configuration
try {
@ -6094,6 +6108,7 @@ RDFItemUpdater.prototype = {
dsURI = dsURI.replace(/%ITEM_ID%/g, aItem.id);
dsURI = dsURI.replace(/%ITEM_VERSION%/g, aItem.version);
dsURI = dsURI.replace(/%ITEM_MAXAPPVERSION%/g, aItem.maxAppVersion);
dsURI = dsURI.replace(/%ITEM_STATUS%/g, itemStatus);
dsURI = dsURI.replace(/%APP_ID%/g, this._updater._appID);
dsURI = dsURI.replace(/%APP_VERSION%/g, this._updater._appVersion);
dsURI = dsURI.replace(/%REQ_VERSION%/g, 1);