From: Tim Starling <tstarling@users.mediawiki.org>
Date: Mon, 22 Feb 2010 10:48:30 +0000 (+0000)
Subject: Fix r62774 in a different way.
X-Git-Tag: 1.31.0-rc.0~37651
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=0781f6f3aaca718bbe19669c36bdaf104ceda335;p=lhc%2Fweb%2Fwiklou.git

Fix r62774 in a different way.
---

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' ) . '<br />' .
 							$skin->link(