From: Huji <huji@users.mediawiki.org>
Date: Thu, 7 Feb 2008 09:54:12 +0000 (+0000)
Subject: (bug 12952) Using Nosuchusershort instead of Nosuchuser when account creatio is disabled
X-Git-Tag: 1.31.0-rc.0~49571
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=23a53744b4ae90745d91b6e670f74f8e02e3285b;p=lhc%2Fweb%2Fwiklou.git

(bug 12952) Using Nosuchusershort instead of Nosuchuser when account creatio is disabled
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 00dc9fae57..319c2914bb 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -372,6 +372,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12931) Fix wrong global variable in SpecialVersion
 * (bug 12919) Use 'deletedrevision' message as content when deleting an old file
   version
+* (bug 12952) Using Nosuchusershort instead of Nosuchuser when account creation
+  is disabled
 
 == Parser changes in 1.12 ==
 
diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 02bb1fe39f..72ccad3cbe 100644
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -471,7 +471,11 @@ class LoginForm {
 				$this->mainLoginForm( wfMsg( 'wrongpassword' ) );
 				break;
 			case self::NOT_EXISTS:
-				$this->mainLoginForm( wfMsg( 'nosuchuser', htmlspecialchars( $this->mName ) ) );
+				if( $wgUser->isAllowed( 'createaccount' ) ){
+					$this->mainLoginForm( wfMsg( 'nosuchuser', htmlspecialchars( $this->mName ) ) );
+				} else {
+					$this->mainLoginForm( wfMsg( 'nosuchusershort', htmlspecialchars( $this->mName ) ) );
+				}
 				break;
 			case self::WRONG_PASS:
 				$this->mainLoginForm( wfMsg( 'wrongpassword' ) );