From 3eeefca79a5c93c3d1c6ca03a3ce1a6e9fcdb9b3 Mon Sep 17 00:00:00 2001
From: Charles Melbye <charlie@users.mediawiki.org>
Date: Sat, 1 Nov 2008 06:09:08 +0000
Subject: [PATCH] Made it so that users can't test out skins if user skins are
 disabled (per Werdna), and user skin selection has now been disabled on the
 preferences special page, with a notice on top telling why that happened.

---
 includes/User.php                        | 4 +---
 includes/specials/SpecialPreferences.php | 8 ++++++++
 languages/messages/MessagesEn.php        | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/includes/User.php b/includes/User.php
index 13ed0be939..00dcb4f8c1 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2111,14 +2111,12 @@ class User {
 			if( $wgAllowUserSkin ) {
 				# get the user skin
 				$userSkin = $this->getOption( 'skin' );
+				$userSkin = $wgRequest->getVal('useskin', $userSkin);
 			} else {
 				# if we're not allowing users to override, then use the default
 				$userSkin = $wgDefaultSkin;
 			}
 			
-			# we'll allow skin "testing" regardless of the AllowUserSkin option
-			$userSkin = $wgRequest->getVal('useskin', $userSkin);
-
 			$this->mSkin =& Skin::newFromKey( $userSkin );
 			wfProfileOut( __METHOD__ );
 		}
diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index b18a9fa0b9..bc9dbc9d31 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -834,6 +834,12 @@ class PreferencesForm {
 
 		# Skin
 		#
+		global $wgAllowUserSkin;
+		
+		if( !$wgAllowUserSkin ) {
+			$wgOut->addHTML( "<p><em>" . wfMsg('skin-override') . "</em></p>" );
+		}
+		
 		$wgOut->addHTML( "<fieldset>\n<legend>\n" . wfMsg('skin') . "</legend>\n" );
 		$mptitle = Title::newMainPage();
 		$previewtext = wfMsg('skin-preview');
@@ -850,6 +856,8 @@ class PreferencesForm {
 		asort($validSkinNames);
 		foreach ($validSkinNames as $skinkey => $sn ) {
 			$checked = $skinkey == $this->mSkin ? ' checked="checked"' : '';
+			
+			$checked = $wgAllowUserSkin ? $checked . '' : $checked . ' disabled=\'disabled\'';
 
 			$mplink = htmlspecialchars($mptitle->getLocalURL("useskin=$skinkey"));
 			$previewlink = "(<a target='_blank' href=\"$mplink\">$previewtext</a>)";
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 32de666c94..07972996fa 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1493,6 +1493,7 @@ Note that their indexes of {{SITENAME}} content may be out of date.',
 'qbsettings-floatingright' => 'Floating right',
 'changepassword'           => 'Change password',
 'skin'                     => 'Skin',
+'skin-override'			   => 'This form has been disabled, because this wiki overrides user skin settings with the default skin set by the administrator.',
 'skin-preview'             => 'Preview',
 'math'                     => 'Math',
 'dateformat'               => 'Date format',
-- 
2.20.1