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

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

diff --git a/includes/logging/ContentModelLogFormatter.php b/includes/logging/ContentModelLogFormatter.php
index 861ea30..23c582c 100644 (file)
--- a/includes/logging/ContentModelLogFormatter.php
+++ b/includes/logging/ContentModelLogFormatter.php
@@ -14,13 +14,15 @@ class ContentModelLogFormatter extends LogFormatter {
        public function getActionLinks() {
                if ( $this->entry->isDeleted( LogPage::DELETED_ACTION ) // Action is hidden
                        || $this->entry->getSubtype() !== 'change'
-                       || !$this->context->getUser()->isAllowed( 'editcontentmodel' )
+                       || !MediaWikiServices::getInstance()
+                               ->getPermissionManager()
+                               ->userHasRight( $this->context->getUser(), 'editcontentmodel' )
                ) {
                        return '';
                }
 
                $params = $this->extractParameters();
-               $revert = MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
+               $revert = $this->getLinkRenderer()->makeKnownLink(
                        SpecialPage::getTitleFor( 'ChangeContentModel' ),
                        $this->msg( 'logentry-contentmodel-change-revertlink' )->text(),
                        [],