Per CR, revert r75873. Does not match docs

diff --git a/includes/User.php b/includes/User.php
index ab6f1c5..88dd403 100644 (file)
--- 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__ );