preferences: Fix skinname msg check in generateSkinOptions
authorjdlrobson <jdlrobson@gmail.com>
Tue, 30 Jul 2019 21:18:05 +0000 (14:18 -0700)
committerKrinkle <krinklemail@gmail.com>
Tue, 30 Jul 2019 22:37:24 +0000 (22:37 +0000)
Fixes a bug introduced in b2b204eeafc.

$useSkin is not the appropriate variable to check here - we want
to check the skin set in preferences.

Bug: T223824
Change-Id: I666e30dd9ff396fd39c47b362d66670dfaa92ca9

includes/preferences/DefaultPreferencesFactory.php

index beed60b..001c975 100644 (file)
@@ -1295,7 +1295,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
                // Display the skin if the user has set it as a preference already before it was hidden.
                $currentUserSkin = $user->getOption( 'skin' );
                if ( isset( $allInstalledSkins[$currentUserSkin] )
-                       && $context->msg( "skinname-$useSkin" )->exists()
+                       && $context->msg( "skinname-$currentUserSkin" )->exists()
                ) {
                        $validSkinNames[$currentUserSkin] = $currentUserSkin;
                }