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

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

diff --git a/includes/specialpage/WantedQueryPage.php b/includes/specialpage/WantedQueryPage.php
index be2f1e8..39e3649 100644 (file)
--- a/includes/specialpage/WantedQueryPage.php
+++ b/includes/specialpage/WantedQueryPage.php
@@ -37,22 +37,11 @@ abstract class WantedQueryPage extends QueryPage {
 
        /**
         * Cache page existence for performance
-        * @param DatabaseBase $db
+        * @param IDatabase $db
         * @param ResultWrapper $res
         */
        function preprocessResults( $db, $res ) {
-               if ( !$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 );
        }
 
        /**
@@ -85,9 +74,9 @@ abstract class WantedQueryPage extends QueryPage {
                                $pageLink = Linker::link(
                                        $title,
                                        null,
-                                       array(),
-                                       array(),
-                                       array( 'broken' )
+                                       [],
+                                       [],
+                                       [ 'broken' ]
                                );
                        }
                        return $this->getLanguage()->specialList( $pageLink, $this->makeWlhLink( $title, $result ) );
@@ -109,7 +98,7 @@ abstract class WantedQueryPage extends QueryPage {
         * @note This will only be run if the page is cached (ie $wgMiserMode = true)
         *   unless forceExistenceCheck() is true.
         * @since 1.24
-        * @return boolean
+        * @return bool
         */
        protected function existenceCheck( Title $title ) {
                return $title->isKnown();