* (bug 29938) list=users&usprop=rights shows rights the user doesn't have

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index acf83ba..57cf5b3 100644 (file)
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -198,6 +198,7 @@ production.
 * Correct the documentation of srprop properties
 * (bug 28817) Add reference help page link to API Modules
 * (bug 29935) Improve formatting of examples in ApiParamInfo
+* (bug 29938) list=users&usprop=rights shows rights the user doesn't have
 
 === Languages updated in 1.19 ===
 

diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index 22f5626..6b8c2ee 100644 (file)
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -248,7 +248,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
 
                        if ( $fld_rights ) {
                                if ( !isset( $lastUserData['rights'] ) ) {
-                                       $lastUserData['rights'] =  User::getGroupPermissions( User::getImplicitGroups() );
+                                       $lastUserData['rights'] =  User::getGroupPermissions( User::newFromName( $lastUser )->getAutomaticGroups() );
                                }
                                if ( !is_null( $row->ug_group2 ) ) {
                                        $lastUserData['rights'] = array_unique( array_merge( $lastUserData['rights'],

diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index bbe90f5..4e7bb2c 100644 (file)
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -154,7 +154,7 @@ class ApiQueryUsers extends ApiQueryBase {
 
                                if ( isset( $this->prop['rights'] ) ) {
                                        if ( !isset( $data[$name]['rights'] ) ) {
-                                               $data[$name]['rights'] = User::getGroupPermissions( User::getImplicitGroups() );
+                                               $data[$name]['rights'] = User::getGroupPermissions( $user->getAutomaticGroups() );
                                        }
 
                                        if ( !is_null( $row->ug_group ) ) {