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

[lhc/web/wiklou.git] / includes / specialpage / PageQueryPage.php

diff --git a/includes/specialpage/PageQueryPage.php b/includes/specialpage/PageQueryPage.php
index d72744b..3bb3f85 100644 (file)
--- a/includes/specialpage/PageQueryPage.php
+++ b/includes/specialpage/PageQueryPage.php
@@ -36,17 +36,7 @@ abstract class PageQueryPage extends QueryPage {
         * @param ResultWrapper $res
         */
        public function preprocessResults( $db, $res ) {
-               if ( !$res->numRows() ) {
-                       return;
-               }
-
-               $batch = new LinkBatch();
-               foreach ( $res as $row ) {
-                       $batch->add( $row->namespace, $row->title );
-               }
-               $batch->execute();
-
-               $res->seek( 0 );
+               $this->executeLBFromResultWrapper( $res );
        }
 
        /**
@@ -65,7 +55,7 @@ abstract class PageQueryPage extends QueryPage {
                        $text = $wgContLang->convert( $title->getPrefixedText() );
                        return Linker::link( $title, htmlspecialchars( $text ) );
                } else {
-                       return Html::element( 'span', array( 'class' => 'mw-invalidtitle' ),
+                       return Html::element( 'span', [ 'class' => 'mw-invalidtitle' ],
                                Linker::getInvalidTitleDescription( $this->getContext(), $row->namespace, $row->title ) );
                }
        }