| Index: trunk/phase3/includes/User.php |
| — | — | @@ -2276,18 +2276,18 @@ |
| 2277 | 2277 | private function createSkinObject() { |
| 2278 | 2278 | wfProfileIn( __METHOD__ ); |
| 2279 | 2279 | |
| 2280 | | - global $wgHiddenPrefs, $wgRequest; |
| | 2280 | + global $wgHiddenPrefs; |
| 2281 | 2281 | if( !in_array( 'skin', $wgHiddenPrefs ) ) { |
| | 2282 | + global $wgRequest; |
| 2282 | 2283 | # get the user skin |
| 2283 | 2284 | $userSkin = $this->getOption( 'skin' ); |
| | 2285 | + $userSkin = $wgRequest->getVal( 'useskin', $userSkin ); |
| 2284 | 2286 | } else { |
| 2285 | 2287 | # if we're not allowing users to override, then use the default |
| 2286 | 2288 | global $wgDefaultSkin; |
| 2287 | 2289 | $userSkin = $wgDefaultSkin; |
| 2288 | 2290 | } |
| 2289 | 2291 | |
| 2290 | | - $userSkin = $wgRequest->getVal( 'useskin', $userSkin ); |
| 2291 | | - |
| 2292 | 2292 | $skin = Skin::newFromKey( $userSkin ); |
| 2293 | 2293 | wfProfileOut( __METHOD__ ); |
| 2294 | 2294 | |