[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Pass LinkRenderer instance to AbuseFilter::addNavigationLinks

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/372792 )

Change subject: Pass LinkRenderer instance to AbuseFilter::addNavigationLinks
......................................................................


Pass LinkRenderer instance to AbuseFilter::addNavigationLinks

Change-Id: I1de60955344d06e5b55f4d2cfdfa8f2d13df831a
---
M includes/AbuseFilter.class.php
M includes/special/SpecialAbuseFilter.php
M includes/special/SpecialAbuseLog.php
3 files changed, 11 insertions(+), 4 deletions(-)

Approvals:
  Huji: Looks good to me, but someone else must approve
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/AbuseFilter.class.php b/includes/AbuseFilter.class.php
index 4b1418f..5dc4870 100644
--- a/includes/AbuseFilter.class.php
+++ b/includes/AbuseFilter.class.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 
@@ -152,8 +153,13 @@
        /**
         * @param IContextSource $context
         * @param string $pageType
+        * @param LinkRenderer $linkRenderer
         */
-       public static function addNavigationLinks( IContextSource $context, 
$pageType ) {
+       public static function addNavigationLinks(
+               IContextSource $context,
+               $pageType,
+               LinkRenderer $linkRenderer
+       ) {
                $linkDefs = [
                        'home' => 'Special:AbuseFilter',
                        'recentchanges' => 'Special:AbuseFilter/history',
@@ -175,7 +181,6 @@
                ];
 
                $links = [];
-               $linkRenderer = 
MediaWikiServices::getInstance()->getLinkRenderer();
 
                foreach ( $linkDefs as $name => $page ) {
                        // Give grep a chance to find the usages:
diff --git a/includes/special/SpecialAbuseFilter.php 
b/includes/special/SpecialAbuseFilter.php
index 04d5819..c419410 100644
--- a/includes/special/SpecialAbuseFilter.php
+++ b/includes/special/SpecialAbuseFilter.php
@@ -108,7 +108,8 @@
                }
 
                // Links at the top
-               AbuseFilter::addNavigationLinks( $this->getContext(), $pageType 
);
+               AbuseFilter::addNavigationLinks(
+                       $this->getContext(), $pageType, 
$this->getLinkRenderer() );
 
                /** @var AbuseFilterView $v */
                $v = new $view( $this, $params );
diff --git a/includes/special/SpecialAbuseLog.php 
b/includes/special/SpecialAbuseLog.php
index bac89fe..617262d 100644
--- a/includes/special/SpecialAbuseLog.php
+++ b/includes/special/SpecialAbuseLog.php
@@ -29,7 +29,8 @@
                $out = $this->getOutput();
                $request = $this->getRequest();
 
-               AbuseFilter::addNavigationLinks( $this->getContext(), 'log' );
+               AbuseFilter::addNavigationLinks(
+                       $this->getContext(), 'log', $this->getLinkRenderer() );
 
                $this->setHeaders();
                $this->outputHeader( 'abusefilter-log-summary' );

-- 
To view, visit https://gerrit.wikimedia.org/r/372792
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1de60955344d06e5b55f4d2cfdfa8f2d13df831a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek <matejsuchane...@gmail.com>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Huji <huji.h...@gmail.com>
Gerrit-Reviewer: Jackmcbarn <jackmcb...@gmail.com>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits