Merge "Convert Special:DeletedContributions to use OOUI."

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

diff --git a/includes/specials/SpecialMostcategories.php b/includes/specials/SpecialMostcategories.php
index 18083f6..6095412 100644 (file)
--- a/includes/specials/SpecialMostcategories.php
+++ b/includes/specials/SpecialMostcategories.php
@@ -43,25 +43,25 @@ class MostcategoriesPage extends QueryPage {
        }
 
        public function getQueryInfo() {
-               return array(
-                       'tables' => array( 'categorylinks', 'page' ),
-                       'fields' => array(
+               return [
+                       'tables' => [ 'categorylinks', 'page' ],
+                       'fields' => [
                                'namespace' => 'page_namespace',
                                'title' => 'page_title',
                                'value' => 'COUNT(*)'
-                       ),
-                       'conds' => array( 'page_namespace' => MWNamespace::getContentNamespaces() ),
-                       'options' => array(
+                       ],
+                       'conds' => [ 'page_namespace' => MWNamespace::getContentNamespaces() ],
+                       'options' => [
                                'HAVING' => 'COUNT(*) > 1',
-                               'GROUP BY' => array( 'page_namespace', 'page_title' )
-                       ),
-                       'join_conds' => array(
-                               'page' => array(
+                               'GROUP BY' => [ 'page_namespace', 'page_title' ]
+                       ],
+                       'join_conds' => [
+                               'page' => [
                                        'LEFT JOIN',
                                        'page_id = cl_from'
-                               )
-                       )
-               );
+                               ]
+                       ]
+               ];
        }
 
        /**
@@ -69,19 +69,7 @@ class MostcategoriesPage extends QueryPage {
         * @param ResultWrapper $res
         */
        function preprocessResults( $db, $res ) {
-               # There's no point doing a batch check if we aren't caching results;
-               # the page must exist for it to have been pulled out of the table
-               if ( !$this->isCached() || !$res->numRows() ) {
-                       return;
-               }
-
-               $batch = new LinkBatch();
-               foreach ( $res as $row ) {
-                       $batch->add( $row->namespace, $row->title );
-               }
-               $batch->execute();
-
-               $res->seek( 0 );
+               $this->executeLBFromResultWrapper( $res );
        }
 
        /**
@@ -94,7 +82,7 @@ class MostcategoriesPage extends QueryPage {
                if ( !$title ) {
                        return Html::element(
                                'span',
-                               array( 'class' => 'mw-invalidtitle' ),
+                               [ 'class' => 'mw-invalidtitle' ],
                                Linker::getInvalidTitleDescription(
                                        $this->getContext(),
                                        $result->namespace,
@@ -103,10 +91,11 @@ class MostcategoriesPage extends QueryPage {
                        );
                }
 
+               $linkRenderer = $this->getLinkRenderer();
                if ( $this->isCached() ) {
-                       $link = Linker::link( $title );
+                       $link = $linkRenderer->makeLink( $title );
                } else {
-                       $link = Linker::linkKnown( $title );
+                       $link = $linkRenderer->makeKnownLink( $title );
                }
 
                $count = $this->msg( 'ncategories' )->numParams( $result->value )->escaped();