| Index: trunk/phase3/includes/Preferences.php |
| — | — | @@ -114,7 +114,7 @@ |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | static function profilePreferences( $user, &$defaultPreferences ) { |
| 118 | | - global $wgLang; |
| | 118 | + global $wgLang, $wgUser; |
| 119 | 119 | ## User info ##################################### |
| 120 | 120 | // Information panel |
| 121 | 121 | $defaultPreferences['username'] = |
| — | — | @@ -209,7 +209,6 @@ |
| 210 | 210 | ); |
| 211 | 211 | |
| 212 | 212 | if( $wgAuth->allowPasswordChange() ) { |
| 213 | | - global $wgUser; // For skin. |
| 214 | 213 | $link = $wgUser->getSkin()->link( SpecialPage::getTitleFor( 'Resetpass' ), |
| 215 | 214 | wfMsgHtml( 'prefs-resetpass' ), array(), |
| 216 | 215 | array( 'returnto' => SpecialPage::getTitleFor( 'Preferences' ) ) ); |
| — | — | @@ -362,7 +361,6 @@ |
| 363 | 362 | $disableEmailPrefs = false; |
| 364 | 363 | } else { |
| 365 | 364 | $disableEmailPrefs = true; |
| 366 | | - global $wgUser; // wgUser is okay here, it's for display |
| 367 | 365 | $skin = $wgUser->getSkin(); |
| 368 | 366 | $emailauthenticated = wfMsgExt( 'emailnotauthenticated', 'parseinline' ) . '<br />' . |
| 369 | 367 | $skin->link( |