From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 17 Aug 2006 07:29:39 +0000 (+0000)
Subject: * (bug 7031) Report missing email on 'email password' instead of false success
X-Git-Tag: 1.31.0-rc.0~55964
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=012580b17cd5b33cf4c2ad2b20b0481f2878e6a6;p=lhc%2Fweb%2Fwiklou.git

* (bug 7031) Report missing email on 'email password' instead of false success
patch by SImetrical: http://bugzilla.wikimedia.org/attachment.cgi?id=2235
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 717b3a8366..43d9ce76b2 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -136,6 +136,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 5969) Clean up tab order on Special:Userlogin forms
 * (bug 3512) namespaceDupes now handles spaces and initial caps properly
 * (bug 7037) Fix regression in login tab order
+* (bug 7031) Report missing email on 'email password' instead of false success
 
 
 == Languages updated ==
diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 8c1b39ed79..e4103a41d7 100644
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -413,7 +413,7 @@ class LoginForm {
 		global $wgServer, $wgScript;
 
 		if ( '' == $u->getEmail() ) {
-			return wfMsg( 'noemail', $u->getName() );
+			return new WikiError( wfMsg( 'noemail', $u->getName() ) );
 		}
 
 		$np = $u->randomPassword();