Function out query building, to allow easier overriding

[lhc/web/wiklou.git] / includes / specials / SpecialTags.php

diff --git a/includes/specials/SpecialTags.php b/includes/specials/SpecialTags.php
index c034429..cd15b21 100644 (file)
--- a/includes/specials/SpecialTags.php
+++ b/includes/specials/SpecialTags.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * Implements Special:Tags
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,11 +16,19 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup SpecialPage
  */
 
 if (!defined('MEDIAWIKI'))
        die;
 
+/**
+ * A special page that lists tags for edits
+ *
+ * @ingroup SpecialPage
+ */
 class SpecialTags extends SpecialPage {
 
        function __construct() {
@@ -27,25 +36,22 @@ class SpecialTags extends SpecialPage {
        }
 
        function execute( $par ) {
-               global $wgOut, $wgUser, $wgMessageCache;
-
-               $wgMessageCache->loadAllMessages();
+               global $wgOut;
 
-               $sk = $wgUser->getSkin();
                $wgOut->setPageTitle( wfMsg( 'tags-title' ) );
                $wgOut->wrapWikiMsg( "<div class='mw-tags-intro'>\n$1\n</div>", 'tags-intro' );
 
                // Write the headers
-               $html = '';
                $html = Xml::tags( 'tr', null, Xml::tags( 'th', null, wfMsgExt( 'tags-tag', 'parseinline' ) ) .
                                Xml::tags( 'th', null, wfMsgExt( 'tags-display-header', 'parseinline' ) ) .
                                Xml::tags( 'th', null, wfMsgExt( 'tags-description-header', 'parseinline' ) ) .
                                Xml::tags( 'th', null, wfMsgExt( 'tags-hitcount-header', 'parseinline' ) )
                        );
                $dbr = wfGetDB( DB_SLAVE );
-               $res = $dbr->select( 'change_tag', array( 'ct_tag', 'count(*) as hitcount' ), array(), __METHOD__, array( 'GROUP BY' => 'ct_tag', 'ORDER BY' => 'hitcount DESC' ) );
+               $res = $dbr->select( 'change_tag', array( 'ct_tag', 'count(*) AS hitcount' ),
+                       array(), __METHOD__, array( 'GROUP BY' => 'ct_tag', 'ORDER BY' => 'hitcount DESC' ) );
 
-               while ( $row = $res->fetchObject() ) {
+               foreach ( $res as $row ) {
                        $html .= $this->doTagRow( $row->ct_tag, $row->hitcount );
                }
 
@@ -76,8 +82,8 @@ class SpecialTags extends SpecialPage {
                $disp .= ' (' . $sk->link( Title::makeTitle( NS_MEDIAWIKI, "Tag-$tag" ), wfMsgHtml( 'tags-edit' ) ) . ')';
                $newRow .= Xml::tags( 'td', null, $disp );
 
-               $desc = wfMsgExt( "tag-$tag-description", 'parseinline' );
-               $desc = wfEmptyMsg( "tag-$tag-description", $desc ) ? '' : $desc;
+               $msg = wfMessage( "tag-$tag-description" );
+               $desc = !$msg->exists() ? '' : $msg->parse();
                $desc .= ' (' . $sk->link( Title::makeTitle( NS_MEDIAWIKI, "Tag-$tag-description" ), wfMsgHtml( 'tags-edit' ) ) . ')';
                $newRow .= Xml::tags( 'td', null, $desc );
 
@@ -89,4 +95,4 @@ class SpecialTags extends SpecialPage {
 
                return Xml::tags( 'tr', null, $newRow ) . "\n";
        }
-}
\ No newline at end of file
+}