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 "Pass Title to IndexPager::buildPrevNextNavigation"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQueryAllUsers.php
diff --git
a/includes/api/ApiQueryAllUsers.php
b/includes/api/ApiQueryAllUsers.php
index
161cfb4
..
e0513e2
100644
(file)
--- a/
includes/api/ApiQueryAllUsers.php
+++ b/
includes/api/ApiQueryAllUsers.php
@@
-90,7
+90,8
@@
class ApiQueryAllUsers extends ApiQueryBase {
if ( !is_null( $params['rights'] ) && count( $params['rights'] ) ) {
$groups = [];
foreach ( $params['rights'] as $r ) {
if ( !is_null( $params['rights'] ) && count( $params['rights'] ) ) {
$groups = [];
foreach ( $params['rights'] as $r ) {
- $groups = array_merge( $groups, User::getGroupsWithPermission( $r ) );
+ $groups = array_merge( $groups, $this->getPermissionManager()
+ ->getGroupsWithPermission( $r ) );
}
// no group with the given right(s) exists, no need for a query
}
// no group with the given right(s) exists, no need for a query
@@
-312,7
+313,7
@@
class ApiQueryAllUsers extends ApiQueryBase {
}
if ( $fld_rights ) {
}
if ( $fld_rights ) {
- $data['rights'] =
User::
getGroupPermissions( $groups );
+ $data['rights'] =
$this->getPermissionManager()->
getGroupPermissions( $groups );
ApiResult::setIndexedTagName( $data['rights'], 'r' );
ApiResult::setArrayType( $data['rights'], 'array' );
}
ApiResult::setIndexedTagName( $data['rights'], 'r' );
ApiResult::setArrayType( $data['rights'], 'array' );
}
@@
-355,7
+356,7
@@
class ApiQueryAllUsers extends ApiQueryBase {
ApiBase::PARAM_ISMULTI => true,
],
'rights' => [
ApiBase::PARAM_ISMULTI => true,
],
'rights' => [
- ApiBase::PARAM_TYPE =>
User::getAllRight
s(),
+ ApiBase::PARAM_TYPE =>
$this->getPermissionManager()->getAllPermission
s(),
ApiBase::PARAM_ISMULTI => true,
],
'prop' => [
ApiBase::PARAM_ISMULTI => true,
],
'prop' => [
@@
-393,7
+394,7
@@
class ApiQueryAllUsers extends ApiQueryBase {
protected function getExamplesMessages() {
return [
'action=query&list=allusers&aufrom=Y'
protected function getExamplesMessages() {
return [
'action=query&list=allusers&aufrom=Y'
- => 'apihelp-query+allusers-example-
Y
',
+ => 'apihelp-query+allusers-example-
y
',
];
}
];
}