| Index: trunk/phase3/includes/specials/SpecialPreferences.php |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | $this->mStubs = $request->getVal( 'wpStubs' ); |
| 44 | 44 | $this->mRows = $request->getVal( 'wpRows' ); |
| 45 | 45 | $this->mCols = $request->getVal( 'wpCols' ); |
| 46 | | - $this->mSkin = $request->getVal( 'wpSkin' ); |
| | 46 | + $this->mSkin = Skin::normalizeKey( $request->getVal( 'wpSkin' ) ); |
| 47 | 47 | $this->mMath = $request->getVal( 'wpMath' ); |
| 48 | 48 | $this->mDate = $request->getVal( 'wpDate' ); |
| 49 | 49 | $this->mUserEmail = $request->getVal( 'wpUserEmail' ); |
| — | — | @@ -268,7 +268,10 @@ |
| 269 | 269 | $wgUser->setOption( 'variant', $this->mUserVariant ); |
| 270 | 270 | $wgUser->setOption( 'nickname', $this->mNick ); |
| 271 | 271 | $wgUser->setOption( 'quickbar', $this->mQuickbar ); |
| 272 | | - $wgUser->setOption( 'skin', $this->mSkin ); |
| | 272 | + global $wgAllowUserSkin; |
| | 273 | + if( $wgAllowUserSkin ) { |
| | 274 | + $wgUser->setOption( 'skin', $this->mSkin ); |
| | 275 | + } |
| 273 | 276 | global $wgUseTeX; |
| 274 | 277 | if( $wgUseTeX ) { |
| 275 | 278 | $wgUser->setOption( 'math', $this->mMath ); |