| Index: trunk/phase3/includes/User.php |
| — | — | @@ -2258,16 +2258,16 @@ |
| 2259 | 2259 | $skin->setTitle( $t ); |
| 2260 | 2260 | return $skin; |
| 2261 | 2261 | } else { |
| 2262 | | - if ( ! $this->mSkin ) { |
| | 2262 | + if ( !$this->mSkin ) { |
| 2263 | 2263 | $this->mSkin = $this->createSkinObject(); |
| 2264 | 2264 | } |
| 2265 | | - |
| 2266 | | - if ( ! $this->mSkin->getTitle() ) { |
| | 2265 | + |
| | 2266 | + if ( !$this->mSkin->getTitle() ) { |
| 2267 | 2267 | global $wgOut; |
| 2268 | 2268 | $t = $wgOut->getTitle(); |
| 2269 | 2269 | $this->mSkin->setTitle($t); |
| 2270 | 2270 | } |
| 2271 | | - |
| | 2271 | + |
| 2272 | 2272 | return $this->mSkin; |
| 2273 | 2273 | } |
| 2274 | 2274 | } |
| — | — | @@ -2276,18 +2276,18 @@ |
| 2277 | 2277 | private function createSkinObject() { |
| 2278 | 2278 | wfProfileIn( __METHOD__ ); |
| 2279 | 2279 | |
| 2280 | | - global $wgHiddenPrefs; |
| | 2280 | + global $wgHiddenPrefs, $wgRequest; |
| 2281 | 2281 | if( !in_array( 'skin', $wgHiddenPrefs ) ) { |
| 2282 | 2282 | # get the user skin |
| 2283 | | - global $wgRequest; |
| 2284 | 2283 | $userSkin = $this->getOption( 'skin' ); |
| 2285 | | - $userSkin = $wgRequest->getVal( 'useskin', $userSkin ); |
| 2286 | 2284 | } else { |
| 2287 | 2285 | # if we're not allowing users to override, then use the default |
| 2288 | 2286 | global $wgDefaultSkin; |
| 2289 | 2287 | $userSkin = $wgDefaultSkin; |
| 2290 | 2288 | } |
| 2291 | 2289 | |
| | 2290 | + $userSkin = $wgRequest->getVal( 'useskin', $userSkin ); |
| | 2291 | + |
| 2292 | 2292 | $skin = Skin::newFromKey( $userSkin ); |
| 2293 | 2293 | wfProfileOut( __METHOD__ ); |
| 2294 | 2294 | |