Merge branch 'release' of https://github.com/MoonchildProductions/UXP into release

1 files changed, 8 insertions, 11 deletions

diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index d12e1de59..600ec2ff5 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -6472,8 +6472,8 @@ AddonInternal.prototype = {
     }
     else if (app.id == FIREFOX_ID) {
      version = FIREFOX_APPCOMPATVERSION;
-      if (this.type != "extension")
-        //Only allow extensions in Firefox compatibility mode
+      if (this.type == "locale")
+        //Never allow language packs in Firefox compatibility mode
         return false;
 #endif
     }
@@ -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.