Merge "Declare dynamic properties"

[lhc/web/wiklou.git] / includes / logging / ProtectLogFormatter.php

diff --git a/includes/logging/ProtectLogFormatter.php b/includes/logging/ProtectLogFormatter.php
index 02a6972..6e3b26b 100644 (file)
--- a/includes/logging/ProtectLogFormatter.php
+++ b/includes/logging/ProtectLogFormatter.php
@@ -101,7 +101,10 @@ class ProtectLogFormatter extends LogFormatter {
                ];
 
                // Show change protection link
-               if ( $this->context->getUser()->isAllowed( 'protect' ) ) {
+               if ( !MediaWikiServices::getInstance()
+                               ->getPermissionManager()
+                               ->userHasRight( $this->context->getUser(), 'protect' )
+               ) {
                        $links[] = $linkRenderer->makeKnownLink(
                                $title,
                                $this->msg( 'protect_change' )->text(),
@@ -150,9 +153,10 @@ class ProtectLogFormatter extends LogFormatter {
        public function formatParametersForApi() {
                $ret = parent::formatParametersForApi();
                if ( isset( $ret['details'] ) && is_array( $ret['details'] ) ) {
+                       $contLang = MediaWikiServices::getInstance()->getContentLanguage();
                        foreach ( $ret['details'] as &$detail ) {
                                if ( isset( $detail['expiry'] ) ) {
-                                       $detail['expiry'] = MediaWikiServices::getInstance()->getContentLanguage()->
+                                       $detail['expiry'] = $contLang->
                                                formatExpiry( $detail['expiry'], TS_ISO_8601, 'infinite' );
                                }
                        }