https://www.mediawiki.org/wiki/Special:Code/MediaWiki/103426
Revision: 103426
Author: johnduhart
Date: 2011-11-17 00:55:53 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
Added context where possible to main AbuseFilter class
Most of the rest cannot get a context since it originates from hooks with no
context sources. Instead of just getting the main context we might as well wait
for a proper solution.
Modified Paths:
--------------
trunk/extensions/AbuseFilter/AbuseFilter.class.php
trunk/extensions/AbuseFilter/special/SpecialAbuseFilter.php
trunk/extensions/AbuseFilter/special/SpecialAbuseLog.php
Modified: trunk/extensions/AbuseFilter/AbuseFilter.class.php
===================================================================
--- trunk/extensions/AbuseFilter/AbuseFilter.class.php 2011-11-17 00:33:02 UTC
(rev 103425)
+++ trunk/extensions/AbuseFilter/AbuseFilter.class.php 2011-11-17 00:55:53 UTC
(rev 103426)
@@ -120,8 +120,7 @@
);
public static $editboxName = null;
- public static function addNavigationLinks( $out, $sk, $pageType ) {
- global $wgLang, $wgUser;
+ public static function addNavigationLinks( IContextSource $context,
$pageType ) {
$linkDefs = array(
'home' => 'Special:AbuseFilter',
'recentchanges' => 'Special:AbuseFilter/history',
@@ -130,7 +129,7 @@
'log' => 'Special:AbuseLog',
);
- if ( $wgUser->isAllowed( 'abusefilter-modify' ) ) {
+ if ( $context->getUser()->isAllowed( 'abusefilter-modify' ) ) {
$linkDefs = array_merge( $linkDefs, array(
'tools' => 'Special:AbuseFilter/tools',
'import' =>
'Special:AbuseFilter/import',
@@ -160,16 +159,16 @@
if ( $name == $pageType ) {
$links[] = Xml::tags( 'strong', null, $msg );
} else {
- $links[] = $sk->link( $title, $msg );
+ $links[] = $context->getSkin()->link( $title,
$msg );
}
}
- $linkStr = wfMsg( 'parentheses', $wgLang->pipeList( $links ) );
+ $linkStr = wfMsg( 'parentheses', $context->getLang()->pipeList(
$links ) );
$linkStr = wfMsgExt( 'abusefilter-topnav', 'parseinline' ) . "
$linkStr";
$linkStr = Xml::tags( 'div', array( 'class' =>
'mw-abusefilter-navigation' ), $linkStr );
- $out->setSubtitle( $linkStr );
+ $context->getOutput()->setSubtitle( $linkStr );
}
/**
Modified: trunk/extensions/AbuseFilter/special/SpecialAbuseFilter.php
===================================================================
--- trunk/extensions/AbuseFilter/special/SpecialAbuseFilter.php 2011-11-17
00:33:02 UTC (rev 103425)
+++ trunk/extensions/AbuseFilter/special/SpecialAbuseFilter.php 2011-11-17
00:55:53 UTC (rev 103426)
@@ -95,7 +95,7 @@
}
// Links at the top
- AbuseFilter::addNavigationLinks( $out, $this->getSkin(),
$pageType );
+ AbuseFilter::addNavigationLinks( $this->getContext(), $pageType
);
$v = new $view( $this, $params );
$v->show();
Modified: trunk/extensions/AbuseFilter/special/SpecialAbuseLog.php
===================================================================
--- trunk/extensions/AbuseFilter/special/SpecialAbuseLog.php 2011-11-17
00:33:02 UTC (rev 103425)
+++ trunk/extensions/AbuseFilter/special/SpecialAbuseLog.php 2011-11-17
00:55:53 UTC (rev 103426)
@@ -25,7 +25,7 @@
$out = $this->getOutput();
$request = $this->getRequest();
- AbuseFilter::addNavigationLinks( $out, $this->getSkin(), 'log'
);
+ AbuseFilter::addNavigationLinks( $this->getContext(), 'log' );
$this->setHeaders();
$this->outputHeader( 'abusefilter-log-summary' );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
