Merge "Revert "Use display name in category page subheadings if provided""

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

diff --git a/includes/specials/SpecialMostinterwikis.php b/includes/specials/SpecialMostinterwikis.php
index b07b833..3e78352 100644 (file)
--- a/includes/specials/SpecialMostinterwikis.php
+++ b/includes/specials/SpecialMostinterwikis.php
@@ -43,29 +43,29 @@ class MostinterwikisPage extends QueryPage {
        }
 
        public function getQueryInfo() {
-               return array(
-                       'tables' => array(
+               return [
+                       'tables' => [
                                'langlinks',
                                'page'
-                       ), 'fields' => array(
+                       ], 'fields' => [
                                'namespace' => 'page_namespace',
                                'title' => 'page_title',
                                'value' => 'COUNT(*)'
-                       ), 'conds' => array(
+                       ], 'conds' => [
                                'page_namespace' => MWNamespace::getContentNamespaces()
-                       ), 'options' => array(
+                       ], 'options' => [
                                'HAVING' => 'COUNT(*) > 1',
-                               'GROUP BY' => array(
+                               'GROUP BY' => [
                                        'page_namespace',
                                        'page_title'
-                               )
-                       ), 'join_conds' => array(
-                               'page' => array(
+                               ]
+                       ], 'join_conds' => [
+                               'page' => [
                                        'LEFT JOIN',
                                        'page_id = ll_from'
-                               )
-                       )
-               );
+                               ]
+                       ]
+               ];
        }
 
        /**
@@ -75,20 +75,7 @@ class MostinterwikisPage 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();
-
-               // Back to start for display
-               $res->seek( 0 );
+               $this->executeLBFromResultWrapper( $res );
        }
 
        /**
@@ -101,7 +88,7 @@ class MostinterwikisPage extends QueryPage {
                if ( !$title ) {
                        return Html::element(
                                'span',
-                               array( 'class' => 'mw-invalidtitle' ),
+                               [ 'class' => 'mw-invalidtitle' ],
                                Linker::getInvalidTitleDescription(
                                        $this->getContext(),
                                        $result->namespace,