Merge "FauxRequest: don’t override getValues()"

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

diff --git a/includes/specials/SpecialEmailUser.php b/includes/specials/SpecialEmailUser.php
index e1606b2..c8b92bd 100644 (file)
--- a/includes/specials/SpecialEmailUser.php
+++ b/includes/specials/SpecialEmailUser.php
@@ -253,7 +253,10 @@ class SpecialEmailUser extends UnlistedSpecialPage {
                        return 'mailnologin';
                }
 
-               if ( !$user->isAllowed( 'sendemail' ) ) {
+               if ( !MediaWikiServices::getInstance()
+                               ->getPermissionManager()
+                               ->userHasRight( $user, 'sendemail' )
+               ) {
                        return 'badaccess';
                }
 
@@ -375,6 +378,15 @@ class SpecialEmailUser extends UnlistedSpecialPage {
                $text .= $context->msg( 'emailuserfooter',
                        $from->name, $to->name )->inContentLanguage()->text();
 
+               if ( $config->get( 'EnableSpecialMute' ) ) {
+                       $specialMutePage = SpecialPage::getTitleFor( 'Mute', $context->getUser()->getName() );
+                       $text .= "\n" . $context->msg(
+                               'specialmute-email-footer',
+                               $specialMutePage->getCanonicalURL(),
+                               $context->getUser()->getName()
+                       )->inContentLanguage()->text();
+               }
+
                // Check and increment the rate limits
                if ( $context->getUser()->pingLimiter( 'emailuser' ) ) {
                        throw new ThrottledError();