convert "::1" and other pseudo-IPv6 addresses that Apache may throw at us to their...

[lhc/web/wiklou.git] / includes / SpecialCategories.php

diff --git a/includes/SpecialCategories.php b/includes/SpecialCategories.php
index 9615101..89cff20 100644 (file)
--- a/includes/SpecialCategories.php
+++ b/includes/SpecialCategories.php
@@ -5,11 +5,6 @@
  * @subpackage SpecialPage
  */
 
-/**
- *
- */
-require_once("QueryPage.php");
-
 /**
  *
  * @package MediaWiki
@@ -28,22 +23,23 @@ class CategoriesPage extends QueryPage {
        function isSyndicated() { return false; }
 
        function getPageHeader() {
-               return wfMsgWikiHtml('categoriespagetext') . "<br />\n";
+               return wfMsgWikiHtml( 'categoriespagetext' );
        }
+       
        function getSQL() {
                $NScat = NS_CATEGORY;
                $dbr =& wfGetDB( DB_SLAVE );
                $categorylinks = $dbr->tableName( 'categorylinks' );
-               $s= "SELECT 'Categories' as type, 
+               $s= "SELECT 'Categories' as type,
                                {$NScat} as namespace,
                                cl_to as title,
                                1 as value,
                                COUNT(*) as count
                           FROM $categorylinks
-                          GROUP BY cl_to";
+                          GROUP BY 1,2,3,4";
                return $s;
        }
-       
+
        function sortDescending() {
                return false;
        }
@@ -52,8 +48,9 @@ class CategoriesPage extends QueryPage {
                global $wgLang;
                $title = Title::makeTitle( NS_CATEGORY, $result->title );
                $plink = $skin->makeLinkObj( $title, $title->getText() );
-               $nlinks = wfMsg( 'nlinks', $result->count );
-               return "$plink ($nlinks)";
+               $nlinks = wfMsgExt( 'nmembers', array( 'parsemag', 'escape'),
+                       $wgLang->formatNum( $result->count ) );
+               return wfSpecialList($plink, $nlinks);
        }
 }