(bug 16044) Vague error message in Special:Emailuser

diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php
index 1556820..b653bdb 100644 (file)
--- 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;