* (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 717b3a8..43d9ce7 100644 (file)
--- 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 8c1b39e..e4103a4 100644 (file)
--- 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();