[MediaWiki-CVS] SVN: [93848] trunk/phase3/includes/specials/SpecialTags.php

[ialex]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/93848

Revision: 93848
Author:   ialex
Date:     2011-08-03 19:42:34 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
* Use local context instead of global variables
* Call Linker methods statically

Modified Paths:
--------------
    trunk/phase3/includes/specials/SpecialTags.php

Modified: trunk/phase3/includes/specials/SpecialTags.php
===================================================================
--- trunk/phase3/includes/specials/SpecialTags.php      2011-08-03 18:25:04 UTC 
(rev 93847)
+++ trunk/phase3/includes/specials/SpecialTags.php      2011-08-03 19:42:34 UTC 
(rev 93848)
@@ -36,11 +36,10 @@
        }
 
        function execute( $par ) {
-               global $wgOut;
+               $out = $this->getOutput();
+               $out->setPageTitle( wfMsg( 'tags-title' ) );
+               $out->wrapWikiMsg( "<div class='mw-tags-intro'>\n$1\n</div>", 
'tags-intro' );
 
-               $wgOut->setPageTitle( wfMsg( 'tags-title' ) );
-               $wgOut->wrapWikiMsg( "<div class='mw-tags-intro'>\n$1\n</div>", 
'tags-intro' );
-
                // Write the headers
                $html = Xml::tags( 'tr', null, Xml::tags( 'th', null, wfMsgExt( 
'tags-tag', 'parseinline' ) ) .
                                Xml::tags( 'th', null, wfMsgExt( 
'tags-display-header', 'parseinline' ) ) .
@@ -59,35 +58,30 @@
                        $html .= $this->doTagRow( $tag, 0 );
                }
 
-               $wgOut->addHTML( Xml::tags( 'table', array( 'class' => 
'wikitable mw-tags-table' ), $html ) );
+               $out->addHTML( Xml::tags( 'table', array( 'class' => 'wikitable 
mw-tags-table' ), $html ) );
        }
 
        function doTagRow( $tag, $hitcount ) {
-               static $sk = null, $doneTags = array();
-               if ( !$sk ) {
-                       $sk = $this->getSkin();
-               }
+               static $doneTags = array();
 
                if ( in_array( $tag, $doneTags ) ) {
                        return '';
                }
 
-               global $wgLang;
-
                $newRow = '';
                $newRow .= Xml::tags( 'td', null, Xml::element( 'tt', null, 
$tag ) );
 
                $disp = ChangeTags::tagDescription( $tag );
-               $disp .= ' (' . $sk->link( Title::makeTitle( NS_MEDIAWIKI, 
"Tag-$tag" ), wfMsgHtml( 'tags-edit' ) ) . ')';
+               $disp .= ' (' . Linker::link( Title::makeTitle( NS_MEDIAWIKI, 
"Tag-$tag" ), wfMsgHtml( 'tags-edit' ) ) . ')';
                $newRow .= Xml::tags( 'td', null, $disp );
 
                $msg = wfMessage( "tag-$tag-description" );
                $desc = !$msg->exists() ? '' : $msg->parse();
-               $desc .= ' (' . $sk->link( Title::makeTitle( NS_MEDIAWIKI, 
"Tag-$tag-description" ), wfMsgHtml( 'tags-edit' ) ) . ')';
+               $desc .= ' (' . Linker::link( Title::makeTitle( NS_MEDIAWIKI, 
"Tag-$tag-description" ), wfMsgHtml( 'tags-edit' ) ) . ')';
                $newRow .= Xml::tags( 'td', null, $desc );
 
-               $hitcount = wfMsgExt( 'tags-hitcount', array( 'parsemag' ), 
$wgLang->formatNum( $hitcount ) );
-               $hitcount = $sk->link( SpecialPage::getTitleFor( 
'Recentchanges' ), $hitcount, array(), array( 'tagfilter' => $tag ) );
+               $hitcount = wfMsgExt( 'tags-hitcount', array( 'parsemag' ), 
$this->getLang()->formatNum( $hitcount ) );
+               $hitcount = Linker::link( SpecialPage::getTitleFor( 
'Recentchanges' ), $hitcount, array(), array( 'tagfilter' => $tag ) );
                $newRow .= Xml::tags( 'td', null, $hitcount );
 
                $doneTags[] = $tag;


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