Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311049

Change subject: Avoid global state in ContributionsToolLinks if possible
......................................................................

Avoid global state in ContributionsToolLinks if possible

Change-Id: I4fe92ae6947de798d7e7c7dfa8e3b44b5bfa5a1c
---
M AbuseFilter.hooks.php
1 file changed, 11 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/49/311049/1

diff --git a/AbuseFilter.hooks.php b/AbuseFilter.hooks.php
index c4ed274..2233f0f 100644
--- a/AbuseFilter.hooks.php
+++ b/AbuseFilter.hooks.php
@@ -683,15 +683,21 @@
         * @param $id
         * @param $nt Title
         * @param $tools
+        * @param SpecialPage|null $sp for context in newer MW versions
         * @return bool
         */
-       public static function onContributionsToolLinks( $id, $nt, &$tools ) {
-               global $wgUser;
-               if ( $wgUser->isAllowed( 'abusefilter-log' ) ) {
+       public static function onContributionsToolLinks( $id, $nt, &$tools, 
SpecialPage $sp = null ) {
+               if ( $sp ) {
+                       $context = $sp->getContext();
+               } else {
+                       // Fallback to main context
+                       $context = RequestContext::getMain();
+               }
+               if ( $context->getUser()->isAllowed( 'abusefilter-log' ) ) {
                        $tools[] = Linker::link(
                                SpecialPage::getTitleFor( 'AbuseLog' ),
-                               wfMessage( 'abusefilter-log-linkoncontribs' 
)->text(),
-                               array( 'title' => wfMessage( 
'abusefilter-log-linkoncontribs-text' )->parse() ),
+                               $context->msg( 'abusefilter-log-linkoncontribs' 
)->text(),
+                               array( 'title' => $context->msg( 
'abusefilter-log-linkoncontribs-text' )->parse() ),
                                array( 'wpSearchUser' => $nt->getText() )
                        );
                }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4fe92ae6947de798d7e7c7dfa8e3b44b5bfa5a1c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>

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

Reply via email to