From 0781f6f3aaca718bbe19669c36bdaf104ceda335 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Mon, 22 Feb 2010 10:48:30 +0000 Subject: [PATCH] Fix r62774 in a different way. --- includes/Preferences.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/includes/Preferences.php b/includes/Preferences.php index 768e3645ad..70d88ec968 100644 --- a/includes/Preferences.php +++ b/includes/Preferences.php @@ -114,7 +114,7 @@ class Preferences { } static function profilePreferences( $user, &$defaultPreferences ) { - global $wgLang; + global $wgLang, $wgUser; ## User info ##################################### // Information panel $defaultPreferences['username'] = @@ -209,7 +209,6 @@ class Preferences { ); if( $wgAuth->allowPasswordChange() ) { - global $wgUser; // For skin. $link = $wgUser->getSkin()->link( SpecialPage::getTitleFor( 'Resetpass' ), wfMsgHtml( 'prefs-resetpass' ), array(), array( 'returnto' => SpecialPage::getTitleFor( 'Preferences' ) ) ); @@ -362,7 +361,6 @@ class Preferences { $disableEmailPrefs = false; } else { $disableEmailPrefs = true; - global $wgUser; // wgUser is okay here, it's for display $skin = $wgUser->getSkin(); $emailauthenticated = wfMsgExt( 'emailnotauthenticated', 'parseinline' ) . '
' . $skin->link( -- 2.20.1