From e94995bd902df8a9af26eff74964d45c1c9607b6 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 3 Nov 2010 13:55:22 +0000
Subject: [PATCH] Per CR, revert r75873. Does not match docs

---
 includes/User.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/User.php b/includes/User.php
index ab6f1c586e..88dd4030ac 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2276,18 +2276,18 @@ class User {
 	private function createSkinObject() {
 		wfProfileIn( __METHOD__ );
 
-		global $wgHiddenPrefs, $wgRequest;
+		global $wgHiddenPrefs;
 		if( !in_array( 'skin', $wgHiddenPrefs ) ) {
+			global $wgRequest;
 			# 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
 			global $wgDefaultSkin;
 			$userSkin = $wgDefaultSkin;
 		}
 
-		$userSkin = $wgRequest->getVal( 'useskin', $userSkin );
-
 		$skin = Skin::newFromKey( $userSkin );
 		wfProfileOut( __METHOD__ );
 		
-- 
2.20.1