Fixes to Special:Mostlinkedcategories.

- Don't execute the LinkBatch if there are no rows.
- Checks for invalid titles and output a message
  if this is the case.

Change-Id: I934c151204ee26f2bbfe0dbc8068b96ae7465625

diff --git a/includes/specials/SpecialMostlinkedcategories.php b/includes/specials/SpecialMostlinkedcategories.php
index 7fb9dea..408d791 100644 (file)
--- a/includes/specials/SpecialMostlinkedcategories.php
+++ b/includes/specials/SpecialMostlinkedcategories.php
@@ -55,6 +55,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 );
@@ -62,10 +66,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 );
        }
 
        /**
@@ -76,7 +77,12 @@ 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 ) );