From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 7 Jan 2009 01:19:36 +0000 (+0000)
Subject: Fix regression in r45351 "(bug 16044) Vague error message in Special:Emailuser"
X-Git-Tag: 1.31.0-rc.0~43538
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=055e868728925ae3a5d897549a6af429ec6c67a7;p=lhc%2Fweb%2Fwiklou.git

Fix regression in r45351 "(bug 16044) Vague error message in Special:Emailuser"

Non-existent users and anon addresses were showing "noemail" instead of "notarget" message, since only the invalid name case was now being checked.
---

diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php
index b653bdbae0..cf90f94d8f 100644
--- a/includes/specials/SpecialEmailuser.php
+++ b/includes/specials/SpecialEmailuser.php
@@ -268,7 +268,7 @@ class EmailUserForm {
 		}
 	
 		$nu = User::newFromName( $nt->getText() );
-		if( is_null( $nu ) ) {
+		if( is_null( $nu ) || !$nu->getId() ) {
 			wfDebug( "Target is invalid user.\n" );
 			return "notarget";
 		} else if ( !$nu->isEmailConfirmed() ) {