X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialEmailuser.php;h=9248a407d33079ea9d741ff79c974b2ff764392d;hb=1f5f6fc2048269335a6b7df71ae6cc6f03de97b7;hp=4a939d494ea241de2d851135a7caf121e00d078e;hpb=98084f14d3de73c007698b711131819d0479be6e;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/specials/SpecialEmailuser.php b/includes/specials/SpecialEmailuser.php index 4a939d494e..9248a407d3 100644 --- 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 ) {