X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialEmailuser.php;h=f322ac40ef48c59f122d0b2a3e6fe625a875287d;hb=973f02712dd34d3f03b62488b7213b30694501bc;hp=30eb38d04aea20057ec7630c680c9a76ebd34204;hpb=9b83841b9b44457b498770b847ac72f53031c34d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php
index 30eb38d04a..f322ac40ef 100644
--- a/includes/specials/SpecialEmailuser.php
+++ b/includes/specials/SpecialEmailuser.php
@@ -224,15 +224,29 @@ class SpecialEmailUser extends UnlistedSpecialPage {
 			wfDebug( "Target is invalid user.\n" );
 
 			return 'notarget';
-		} elseif ( !$target->isEmailConfirmed() ) {
+		}
+
+		if ( !$target->isEmailConfirmed() ) {
 			wfDebug( "User has no valid email.\n" );
 
 			return 'noemail';
-		} elseif ( !$target->canReceiveEmail() ) {
+		}
+
+		if ( !$target->canReceiveEmail() ) {
 			wfDebug( "User does not allow user emails.\n" );
 
 			return 'nowikiemail';
-		} elseif ( $sender !== null ) {
+		}
+
+		if ( $sender !== null && !$target->getOption( 'email-allow-new-users' ) &&
+			$sender->isNewbie()
+		) {
+			wfDebug( "User does not allow user emails from new users.\n" );
+
+			return 'nowikiemail';
+		}
+
+		if ( $sender !== null ) {
 			$blacklist = $target->getOption( 'email-blacklist', [] );
 			if ( $blacklist ) {
 				$lookup = CentralIdLookup::factory();