* (bug 24724) list=allusers is out by 1 (shows total users - 1)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9161404..4b9b647 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -372,6 +372,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Add format=dump and format=dumpfm, outputs results in PHP's var_dump() format
 * For required string parameters, if '' is provided, this is now classed as
   missing
+* (bug 24724) list=allusers is out by 1 (shows total users - 1)
 
 === Languages updated in 1.17 ===
 

diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index a41f2a9..b60714c 100644 (file)
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -184,6 +184,15 @@ class ApiQueryAllUsers extends ApiQueryBase {
                        }
                }
 
+               if ( is_array( $lastUserData ) ) {
+                       $fit = $result->addValue( array( 'query', $this->getModuleName() ),
+                                       null, $lastUserData );
+                       if ( !$fit ) {
+                               $this->setContinueEnumParameter( 'from',
+                                               $this->keyToTitle( $lastUserData['name'] ) );
+                       }
+               }
+
                $result->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'u' );
        }