From: jdlrobson <jdlrobson@gmail.com>
Date: Tue, 30 Jul 2019 21:18:05 +0000 (-0700)
Subject: preferences: Fix skinname msg check in generateSkinOptions
X-Git-Tag: 1.34.0-rc.0~829^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=789b5239f64459911e6dcc4166254337790c4253;p=lhc%2Fweb%2Fwiklou.git

preferences: Fix skinname msg check in generateSkinOptions

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
---

diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php
index beed60b1ab..001c975dbc 100644
--- a/includes/preferences/DefaultPreferencesFactory.php
+++ b/includes/preferences/DefaultPreferencesFactory.php
@@ -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;
 		}