diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-03-19 06:35:47 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-03-19 06:35:47 +0100 |
commit | 32ca14f34b62745ef1d7a30d1ee387ba3ab58570 (patch) | |
tree | e089df4a49f80d725077a47f7243c0d19939c11c | |
parent | 0da8e0b496b52a346f5b4dc5f26dd6ea5c423e44 (diff) | |
download | UXP-32ca14f34b62745ef1d7a30d1ee387ba3ab58570.tar UXP-32ca14f34b62745ef1d7a30d1ee387ba3ab58570.tar.gz UXP-32ca14f34b62745ef1d7a30d1ee387ba3ab58570.tar.lz UXP-32ca14f34b62745ef1d7a30d1ee387ba3ab58570.tar.xz UXP-32ca14f34b62745ef1d7a30d1ee387ba3ab58570.zip |
Revert "Issue #1446 - Only match extension add-on types for target applications."
This reverts commit 4889e6dbbd2e13e778e7a244e7834ffc881e7a80.
-rw-r--r-- | toolkit/mozapps/extensions/internal/XPIProvider.jsm | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index d12e1de59..2f298a934 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -6528,15 +6528,12 @@ AddonInternal.prototype = { app = targetApp; } #ifdef MOZ_PHOENIX_EXTENSIONS - // Special case: check for Firefox TargetApps. this has to be done AFTER - // the initial check to make sure appinfo.ID is preferred, even if - // Firefox is listed before it in the install manifest. - // Only do this for extensions. Other types should not be allowed. - if (this.type == "extension") { - for (let targetApp of this.targetApplications) { - if (targetApp.id == FIREFOX_ID) //Firefox GUID - return targetApp; - } + //Special case: check for Firefox TargetApps. this has to be done AFTER + //the initial check to make sure appinfo.ID is preferred, even if + //Firefox is listed before it in the install manifest. + for (let targetApp of this.targetApplications) { + if (targetApp.id == FIREFOX_ID) //Firefox GUID + return targetApp; } #endif // Return toolkit ID if toolkit. |