Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-07-25 06:31:41 +08:00
commit f35488b465
5 changed files with 30 additions and 20 deletions

View file

@ -6477,8 +6477,12 @@ AddonInternal.prototype = {
return false;
#endif
}
else if (app.id == TOOLKIT_ID)
version = aPlatformVersion
else if (app.id == TOOLKIT_ID) {
#ifdef MOZ_PHOENIX_EXTENSIONS
this.native = true;
#endif
version = aPlatformVersion;
}
// Only extensions and dictionaries can be compatible by default; themes
// and language packs always use strict compatibility checking.