Merge "ApiBase::PARAM_DFLT => null is the default anyway"

[lhc/web/wiklou.git] / includes / api / ApiQuerySearch.php

diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index 53939d8..637fc4c 100644 (file)
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -278,6 +278,12 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
                                ), 'p' );
                        }
                } else {
+                       $resultPageSet->setRedirectMergePolicy( function ( $current, $new ) {
+                               if ( !isset( $current['index'] ) || $new['index'] < $current['index'] ) {
+                                       $current['index'] = $new['index'];
+                               }
+                               return $current;
+                       } );
                        $resultPageSet->populateFromTitles( $titles );
                        $offset = $params['offset'] + 1;
                        foreach ( $titles as $index => $title ) {