Use Linker::link() instead of Linker::linkKnown() when having options

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

diff --git a/includes/specials/SpecialMostlinkedcategories.php b/includes/specials/SpecialMostlinkedcategories.php
index 6b36d5a..df2975c 100644 (file)
--- a/includes/specials/SpecialMostlinkedcategories.php
+++ b/includes/specials/SpecialMostlinkedcategories.php
@@ -25,7 +25,7 @@
  */
 
 /**
- * A querypage to show categories ordered in descending order by the pages  in them
+ * A querypage to show categories ordered in descending order by the pages in them
  *
  * @ingroup SpecialPage
  */
@@ -35,20 +35,22 @@ class MostlinkedCategoriesPage extends QueryPage {
                parent::__construct( $name );
        }
 
-       function isExpensive() { return true; }
-       function isSyndicated() { return false; }
+       function isSyndicated() {
+               return false;
+       }
 
        function getQueryInfo() {
                return array (
-                       'tables' => array ( 'categorylinks' ),
-                       'fields' => array ( 'cl_to AS title',
-                                       NS_CATEGORY . ' AS namespace',
-                                       'COUNT(*) AS value' ),
-                       'options' => array ( 'GROUP BY' => 'cl_to' )
+                       'tables' => array ( 'category' ),
+                       'fields' => array ( 'title' => 'cat_title',
+                                       'namespace' => NS_CATEGORY,
+                                       'value' => 'cat_pages' ),
                );
        }
 
-       function sortDescending() { return true; }
+       function sortDescending() {
+               return true;
+       }
 
        /**
         * Fetch user page links and cache their existence
@@ -57,6 +59,10 @@ class MostlinkedCategoriesPage extends QueryPage {
         * @param $res DatabaseResult
         */
        function preprocessResults( $db, $res ) {
+               if ( !$res->numRows() ) {
+                       return;
+               }
+
                $batch = new LinkBatch;
                foreach ( $res as $row ) {
                        $batch->add( NS_CATEGORY, $row->title );
@@ -64,10 +70,7 @@ class MostlinkedCategoriesPage extends QueryPage {
                $batch->execute();
 
                // Back to start for display
-               if ( $db->numRows( $res ) > 0 ) {
-                       // If there are no rows we get an error seeking.
-                       $db->dataSeek( $res, 0 );
-               }
+               $res->seek( 0 );
        }
 
        /**
@@ -78,12 +81,17 @@ class MostlinkedCategoriesPage extends QueryPage {
        function formatResult( $skin, $result ) {
                global $wgContLang;
 
-               $nt = Title::makeTitle( NS_CATEGORY, $result->title );
+               $nt = Title::makeTitleSafe( NS_CATEGORY, $result->title );
+               if ( !$nt ) {
+                       return Html::element( 'span', array( 'class' => 'mw-invalidtitle' ),
+                               Linker::getInvalidTitleDescription( $this->getContext(), NS_CATEGORY, $result->title ) );
+               }
+
                $text = $wgContLang->convert( $nt->getText() );
 
                $plink = Linker::link( $nt, htmlspecialchars( $text ) );
 
                $nlinks = $this->msg( 'nmembers' )->numParams( $result->value )->escaped();
-               return $this->getLang()->specialList( $plink, $nlinks );
+               return $this->getLanguage()->specialList( $plink, $nlinks );
        }
 }