MediaWiki 1.16.1

[autoinstallsdev/mediawiki.git] / includes / specials / SpecialCategories.php

diff --git a/includes/specials/SpecialCategories.php b/includes/specials/SpecialCategories.php
index c6e73f2b2a37a454dda62f8ee1b23e7ecb324c85..eb49fdbcea2a70e48cf1f44dfe2cd3c0042b0f1b 100644 (file)
--- a/includes/specials/SpecialCategories.php
+++ b/includes/specials/SpecialCategories.php
@@ -12,10 +12,12 @@ function wfSpecialCategories( $par=null ) {
        } else {
                $from = $par;
        }
+       $wgOut->allowClickjacking();
        $cap = new CategoryPager( $from );
+       $cap->doQuery();
        $wgOut->addHTML(
                XML::openElement( 'div', array('class' => 'mw-spcontent') ) .
-               wfMsgExt( 'categoriespagetext', array( 'parse' ) ) .
+               wfMsgExt( 'categoriespagetext', array( 'parse' ), $cap->getNumRows() ) .
                $cap->getStartForm( $from ) .
                $cap->getNavigationBar() .
                '<ul>' . $cap->getBody() . '</ul>' .
@@ -35,10 +37,7 @@ class CategoryPager extends AlphabeticPager {
                parent::__construct();
                $from = str_replace( ' ', '_', $from );
                if( $from !== '' ) {
-                       global $wgCapitalLinks, $wgContLang;
-                       if( $wgCapitalLinks ) {
-                               $from = $wgContLang->ucfirst( $from );
-                       }
+                       $from = Title::capitalize( $from, NS_CATEGORY );
                        $this->mOffset = $from;
                }
        }
@@ -74,9 +73,6 @@ class CategoryPager extends AlphabeticPager {
 
        /* Override getBody to apply LinksBatch on resultset before actually outputting anything. */
        public function getBody() {
-               if (!$this->mQueryDone) {
-                       $this->doQuery();
-               }
                $batch = new LinkBatch;
 
                $this->mResult->rewind();
@@ -92,7 +88,7 @@ class CategoryPager extends AlphabeticPager {
        function formatRow($result) {
                global $wgLang;
                $title = Title::makeTitle( NS_CATEGORY, $result->cat_title );
-               $titleText = $this->getSkin()->makeLinkObj( $title, htmlspecialchars( $title->getText() ) );
+               $titleText = $this->getSkin()->link( $title, htmlspecialchars( $title->getText() ) );
                $count = wfMsgExt( 'nmembers', array( 'parsemag', 'escape' ),
                                $wgLang->formatNum( $result->cat_pages ) );
                return Xml::tags('li', null, "$titleText ($count)" ) . "\n";