From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Fri, 2 Jan 2009 22:14:54 +0000 (+0000)
Subject: (bug 16044) Vague error message in Special:Emailuser
X-Git-Tag: 1.31.0-rc.0~43599
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=902d6dafad6952c94f41f763891c5ca6788e704c;p=lhc%2Fweb%2Fwiklou.git

(bug 16044) Vague error message in Special:Emailuser
---

diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php
index 1556820e7f..b653bdbae0 100644
--- a/includes/specials/SpecialEmailuser.php
+++ b/includes/specials/SpecialEmailuser.php
@@ -268,9 +268,15 @@ class EmailUserForm {
 		}
 	
 		$nu = User::newFromName( $nt->getText() );
-		if( is_null( $nu ) || !$nu->canReceiveEmail() ) {
-			wfDebug( "Target is invalid user or can't receive.\n" );
+		if( is_null( $nu ) ) {
+			wfDebug( "Target is invalid user.\n" );
+			return "notarget";
+		} else if ( !$nu->isEmailConfirmed() ) {
+			wfDebug( "User has no valid email.\n" );
 			return "noemail";
+		} else if ( !$nu->canReceiveEmail() ) {
+			wfDebug( "User does not allow user emails.\n" );
+			return "nowikiemail";
 		}
 		
 		return $nu;