http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96104
Revision: 96104
Author: siebrand
Date: 2011-09-02 15:34:55 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
Use Linker statically.
No constant check needed for files only containing a class.
Modified Paths:
--------------
trunk/extensions/AbuseFilter/Views/AbuseFilterView.php
trunk/extensions/AbuseFilter/Views/AbuseFilterViewList.php
Modified: trunk/extensions/AbuseFilter/Views/AbuseFilterView.php
===================================================================
--- trunk/extensions/AbuseFilter/Views/AbuseFilterView.php 2011-09-02
15:32:06 UTC (rev 96103)
+++ trunk/extensions/AbuseFilter/Views/AbuseFilterView.php 2011-09-02
15:34:55 UTC (rev 96104)
@@ -1,6 +1,4 @@
<?php
-if ( !defined( 'MEDIAWIKI' ) )
- die();
abstract class AbuseFilterView {
function __construct( $page, $params ) {
@@ -49,11 +47,10 @@
class AbuseFilterChangesList extends OldChangesList {
public function insertExtra( &$s, &$rc, &$classes ) {
- $sk = $this->skin;
$examineParams = empty( $rc->examineParams ) ? array() :
$rc->examineParams;
$title = SpecialPage::getTitleFor( 'AbuseFilter', 'examine/' .
$rc->mAttribs['rc_id'] );
- $examineLink = $sk->link( $title, wfMsgExt(
'abusefilter-changeslist-examine', 'parseinline' ), array(), $examineParams );
+ $examineLink = Linker::link( $title, wfMsgExt(
'abusefilter-changeslist-examine', 'parseinline' ), array(), $examineParams );
$s .= " ($examineLink)";
Modified: trunk/extensions/AbuseFilter/Views/AbuseFilterViewList.php
===================================================================
--- trunk/extensions/AbuseFilter/Views/AbuseFilterViewList.php 2011-09-02
15:32:06 UTC (rev 96103)
+++ trunk/extensions/AbuseFilter/Views/AbuseFilterViewList.php 2011-09-02
15:34:55 UTC (rev 96104)
@@ -1,11 +1,8 @@
<?php
-if ( !defined( 'MEDIAWIKI' ) ) {
- die();
-}
class AbuseFilterViewList extends AbuseFilterView {
function show() {
- global $wgUser, $wgOut, $wgRequest;
+ global $wgOut, $wgRequest;
// Status info...
$this->showStatus();
@@ -13,10 +10,9 @@
$wgOut->addWikiMsg( 'abusefilter-intro' );
// New filter button
- $sk = $wgUser->getSkin();
if ( $this->canEdit() ) {
$title = $this->getTitle( 'new' );
- $link = $sk->link( $title, wfMsg( 'abusefilter-new' ) );
+ $link = Linker::link( $title, wfMsg( 'abusefilter-new'
) );
$links = Xml::tags( 'p', null, $link ) . "\n";
$wgOut->addHTML( $links );
}
@@ -42,10 +38,8 @@
}
function showList( $conds = array( 'af_deleted' => 0 ), $optarray =
array() ) {
- global $wgOut, $wgUser;
+ global $wgOut;
- $this->mSkin = $wgUser->getSkin();
-
$output = '';
$output .= Xml::element( 'h2', null,
wfMsgExt( 'abusefilter-list', array( 'parseinline' ) )
);
@@ -188,21 +182,14 @@
function formatValue( $name, $value ) {
global $wgOut, $wgLang;
- static $sk = null;
-
- if ( empty( $sk ) ) {
- global $wgUser;
- $sk = $wgUser->getSkin();
- }
-
$row = $this->mCurrentRow;
switch( $name ) {
case 'af_id':
- return $sk->link(
+ return Linker::link(
SpecialPage::getTitleFor(
'AbuseFilter', intval( $value ) ), intval( $value ) );
case 'af_public_comments':
- return $sk->link(
+ return Linker::link(
SpecialPage::getTitleFor(
'AbuseFilter', intval( $row->af_id ) ),
$wgOut->parseInline( $value )
);
@@ -238,7 +225,8 @@
array( 'parseinline' ),
$wgLang->formatNum( $value )
);
- $link = $sk->makeKnownLinkObj(
+ // @todo FIXME: makeKnownLinkObj() is
deprecated.
+ $link = Linker::makeKnownLinkObj(
SpecialPage::getTitleFor( 'AbuseLog' ),
$count_display,
'wpSearchFilter=' . $row->af_id
@@ -246,11 +234,11 @@
return $link;
case 'af_timestamp':
$userLink =
- $sk->userLink(
+ Linker::userLink(
$row->af_user,
$row->af_user_text
) .
- $sk->userToolLinks(
+ Linker::userToolLinks(
$row->af_user,
$row->af_user_text
);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
