From: Platonides <platonides@users.mediawiki.org>
Date: Sun, 25 Jul 2010 18:20:21 +0000 (+0000)
Subject: Follow up r68354. $wgUser *is* used in successfulLogin() and mailPasswordInternal().
X-Git-Tag: 1.31.0-rc.0~35941
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22calendrier%22%2C%22type=semaine%22%29%20.%20%22?a=commitdiff_plain;h=bfae0266bff15547725cbf1914e46eca62d48cc9;p=lhc%2Fweb%2Fwiklou.git

Follow up r68354. $wgUser *is* used in successfulLogin() and mailPasswordInternal().
---

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 818a94e017..ecabb9f6de 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -803,7 +803,7 @@ class LoginForm {
 	 * @private
 	 */
 	function mailPasswordInternal( $u, $throttle = true, $emailTitle = 'passwordremindertitle', $emailText = 'passwordremindertext' ) {
-		global $wgServer, $wgScript, $wgNewPasswordExpiry;
+		global $wgServer, $wgScript, $wgUser, $wgNewPasswordExpiry;
 
 		if ( $u->getEmail() == '' ) {
 			return new WikiError( wfMsg( 'noemail', $u->getName() ) );
@@ -838,7 +838,7 @@ class LoginForm {
 	 * @private
 	 */
 	function successfulLogin() {
-		global $wgOut;
+		global $wgUser, $wgOut;
 
 		# Run any hooks; display injected HTML if any, else redirect
 		$injected_html = '';