* (bug 27708) list=users does not have a property to return user id

Add userid to ApiQueryUsers

Move userid in ApiQueryAllUsers before name

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5ebd6df..c55f006 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -184,6 +184,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 27611) list=blocks: Use ipb_by_text instead of join with user table
 * (bug 27616) Add userid of blocked user and blocker to list=blocks
 * (bug 27688) Simplify queries to list user block information
+* (bug 27708) list=users does not have a property to return user id
 
 === Languages updated in 1.18 ===
 

diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index 95fbbf2..22026f3 100644 (file)
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -175,8 +175,8 @@ class ApiQueryAllUsers extends ApiQueryBase {
                                // Record new user's data
                                $lastUser = $row->user_name;
                                $lastUserData = array(
-                                       'name' => $lastUser,
                                        'userid' => $row->user_id,
+                                       'name' => $lastUser,
                                );
                                if ( $fld_blockinfo && !is_null( $row->ipb_by_text ) ) {
                                        $lastUserData['blockedby'] = $row->ipb_by_text;

diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index 4fec5ad..910e255 100644 (file)
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -135,6 +135,8 @@ if ( !defined( 'MEDIAWIKI' ) ) {
                        foreach ( $res as $row ) {
                                $user = User::newFromRow( $row );
                                $name = $user->getName();
+
+                               $data[$name]['userid'] = $user->getId();
                                $data[$name]['name'] = $name;
 
                                if ( isset( $this->prop['editcount'] ) ) {