Merge "Do not require titles on Special:ComparePages"

[lhc/web/wiklou.git] / includes / specials / SpecialEmailuser.php

diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php
index d57ba09..0e93194 100644 (file)
--- a/includes/specials/SpecialEmailuser.php
+++ b/includes/specials/SpecialEmailuser.php
@@ -204,7 +204,7 @@ class SpecialEmailUser extends UnlistedSpecialPage {
                $nu = User::newFromName( $target );
                $error = self::validateTarget( $nu, $sender );
 
-               return $error ? $error : $nu;
+               return $error ?: $nu;
        }
 
        /**
@@ -238,28 +238,12 @@ class SpecialEmailUser extends UnlistedSpecialPage {
                        return 'nowikiemail';
                }
 
-               if (
-                       $target->getEditCount() === 0
-                       && ( $sender === null || !$sender->isAllowed( 'sendemail-new-users' ) )
+               if ( $sender !== null && !$target->getOption( 'email-allow-new-users' ) &&
+                       $sender->isNewbie()
                ) {
-                       // Determine if target has any other logged actions.
-                       $dbr = wfGetDB( DB_REPLICA );
-                       $log_id = $dbr->selectField(
-                               'logging',
-                               'log_id',
-                               [
-                                       'log_user' => $target->getId(),
-                                       "NOT (log_type = 'newusers' AND log_action = 'autocreate')",
-                               ],
-                               __METHOD__,
-                               [ 'LIMIT' => 1 ]
-                       );
-
-                       if ( !$log_id ) {
-                               wfDebug( "User has no logged actions on this wiki.\n" );
+                       wfDebug( "User does not allow user emails from new users.\n" );
 
-                               return 'nowikiemail';
-                       }
+                       return 'nowikiemail';
                }
 
                if ( $sender !== null ) {