X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialEmailuser.php;h=830b43817fa6f9a4de00add3b46826993b97a598;hb=512a187a2f58b020fb866f0fdc5703091f9e47e3;hp=085b68d6d82c9965bb45d95337d7fed984ee372c;hpb=299b7b412731f60866885c0532558c349ba3da76;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php
index 085b68d6d8..830b43817f 100644
--- a/includes/specials/SpecialEmailuser.php
+++ b/includes/specials/SpecialEmailuser.php
@@ -231,14 +231,15 @@ class SpecialEmailUser extends UnlistedSpecialPage {
 			return 'usermaildisabled';
 		}
 
-		if ( !$user->isAllowed( 'sendemail' ) ) {
-			return 'badaccess';
-		}
-
+		// Run this before $user->isAllowed, to show appropriate message to anons (T160309)
 		if ( !$user->isEmailConfirmed() ) {
 			return 'mailnologin';
 		}
 
+		if ( !$user->isAllowed( 'sendemail' ) ) {
+			return 'badaccess';
+		}
+
 		if ( $user->isBlockedFromEmailuser() ) {
 			wfDebug( "User is blocked from sending e-mail.\n" );
 
@@ -288,7 +289,7 @@ class SpecialEmailUser extends UnlistedSpecialPage {
 				'text',
 				[
 					'id' => 'emailusertarget',
-					'class' => 'mw-autocomplete-user',  // used by mediawiki.userSuggest
+					'class' => 'mw-autocomplete-user', // used by mediawiki.userSuggest
 					'autofocus' => true,
 					'size' => 30,
 				]