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 122fa9b..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';
                }
 
@@ -381,7 +384,7 @@ class SpecialEmailUser extends UnlistedSpecialPage {
                                'specialmute-email-footer',
                                $specialMutePage->getCanonicalURL(),
                                $context->getUser()->getName()
-                       );
+                       )->inContentLanguage()->text();
                }
 
                // Check and increment the rate limits