Replace some wfMessage by ContextSource::msg

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

diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php
index 4a939d4..7de44d8 100644 (file)
--- a/includes/specials/SpecialEmailuser.php
+++ b/includes/specials/SpecialEmailuser.php
@@ -21,6 +21,7 @@
  * @ingroup SpecialPage
  */
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Preferences\MultiUsernameFilter;
 
 /**
  * A special page that allows users to send e-mails to other users
@@ -247,8 +248,9 @@ class SpecialEmailUser extends UnlistedSpecialPage {
                }
 
                if ( $sender !== null ) {
-                       $blacklist = $target->getOption( 'email-blacklist', [] );
+                       $blacklist = $target->getOption( 'email-blacklist', '' );
                        if ( $blacklist ) {
+                               $blacklist = MultiUsernameFilter::splitIds( $blacklist );
                                $lookup = CentralIdLookup::factory();
                                $senderId = $lookup->centralIdFromLocalUser( $sender );
                                if ( $senderId !== 0 && in_array( $senderId, $blacklist ) ) {
@@ -267,7 +269,7 @@ class SpecialEmailUser extends UnlistedSpecialPage {
         *
         * @param User $user
         * @param string $editToken Edit token
-        * @param Config $config optional for backwards compatibility
+        * @param Config|null $config optional for backwards compatibility
         * @return string|null Null on success or string on error
         */
        public static function getPermissionsError( $user, $editToken, Config $config = null ) {
@@ -436,7 +438,7 @@ class SpecialEmailUser extends UnlistedSpecialPage {
                         * SPF and bounce problems with some mailers (see below).
                         */
                        $mailFrom = new MailAddress( $config->get( 'PasswordSender' ),
-                               wfMessage( 'emailsender' )->inContentLanguage()->text() );
+                               $context->msg( 'emailsender' )->inContentLanguage()->text() );
                        $replyTo = $from;
                } else {
                        /**
@@ -480,7 +482,7 @@ class SpecialEmailUser extends UnlistedSpecialPage {
                                if ( $config->get( 'UserEmailUseReplyTo' ) ) {
                                        $mailFrom = new MailAddress(
                                                $config->get( 'PasswordSender' ),
-                                               wfMessage( 'emailsender' )->inContentLanguage()->text()
+                                               $context->msg( 'emailsender' )->inContentLanguage()->text()
                                        );
                                        $replyTo = $ccFrom;
                                } else {