563971 - When migrating with a lightweight theme enabled the default theme will think it is enabled

Status: VERIFIED FIXED

(Toolkit :: Add-ons Manager, defect, P2)

Description

[Dave Townsend [:mossop]]

When a lightweight theme is enabled the default theme should be marked as userDisabled but during migration we won't check on the lightweight themes when deciding on the value of userDisabled for the default theme.

Comment 1

[Henrik Skupin [:whimboo][⌚️UTC+1]]

For a testcase see attachment 442850 [details].

Comment 6

[Dave Townsend [:mossop]]

Attachment: patch rev 1

I dislike having to make the providers talk like this but this really is the simplest fix.

Comment 7

[Robert Strong (they/them - no direct email)]

Comment on attachment 477785 [details] [diff] [review]
patch rev 1

>diff --git a/toolkit/mozapps/extensions/XPIProvider.jsm b/toolkit/mozapps/extensions/XPIProvider.jsm
>--- a/toolkit/mozapps/extensions/XPIProvider.jsm
>+++ b/toolkit/mozapps/extensions/XPIProvider.jsm
>@@ -509,21 +510,25 @@ function loadManifestFromRDF(aUri, aStre
>     }
>     else {
>       platform.os = aPlatform;
>     }
> 
>     addon.targetPlatforms.push(platform);
>   });
> 
>-  // Themes are disabled by default unless they are currently selected
>-  if (addon.type == "theme")
>-    addon.userDisabled = addon.internalName != XPIProvider.selectedSkin;
>-  else
>+  // Themes are disabled if they aren't the selected skin or there is an active
>+  // lightweight theme
nit: the wording here made me think that if there is an active lightweight theme a theme is disabled. Perhaps
// A theme's userDisabled value is true if the theme is not the selected skin or the theme is a lightweight theme and it isn't the current lightweight theme.

Might be a good thing to make a note somewhere that themes can't be softblocked.

Comment 8

[Mike Beltzner [:beltzner, not reading bugmail]]

Important for consumer outreach beta.

Comment 9

[Dave Townsend [:mossop]]

Landed for b7: http://hg.mozilla.org/mozilla-central/rev/626d22af7eff

Note that this wont actually correct the problem if the user has already migrated their DB, they'll need to just switch to a new theme to fix it.

Comment 10

[Henrik Skupin [:whimboo][⌚️UTC+1]]

Verified fixed with Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:2.0b8pre) Gecko/20101010 Firefox/4.0b8pre