dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Follow-up I0b781c11 (2a55449): use User::getAutomaticGroups()."
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQueryAllUsers.php
diff --git
a/includes/api/ApiQueryAllUsers.php
b/includes/api/ApiQueryAllUsers.php
index
1325662
..
7f50cba
100644
(file)
--- a/
includes/api/ApiQueryAllUsers.php
+++ b/
includes/api/ApiQueryAllUsers.php
@@
-252,7
+252,7
@@
class ApiQueryAllUsers extends ApiQueryBase {
if ( $fld_groups ) {
if ( !isset( $lastUserData['groups'] ) ) {
if ( $lastUserObj ) {
if ( $fld_groups ) {
if ( !isset( $lastUserData['groups'] ) ) {
if ( $lastUserObj ) {
- $lastUserData['groups'] =
ApiQueryUsers::getAutoGroups( $lastUserObj
);
+ $lastUserData['groups'] =
$lastUserObj->getAutomaticGroups(
);
} else {
// This should not normally happen
$lastUserData['groups'] = array();
} else {
// This should not normally happen
$lastUserData['groups'] = array();
@@
-267,7
+267,7
@@
class ApiQueryAllUsers extends ApiQueryBase {
}
if ( $fld_implicitgroups && !isset( $lastUserData['implicitgroups'] ) && $lastUserObj ) {
}
if ( $fld_implicitgroups && !isset( $lastUserData['implicitgroups'] ) && $lastUserObj ) {
- $lastUserData['implicitgroups'] =
ApiQueryUsers::getAutoGroups( $lastUserObj
);
+ $lastUserData['implicitgroups'] =
$lastUserObj->getAutomaticGroups(
);
$result->setIndexedTagName( $lastUserData['implicitgroups'], 'g' );
}
if ( $fld_rights ) {
$result->setIndexedTagName( $lastUserData['implicitgroups'], 'g' );
}
if ( $fld_rights ) {