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 "Make DBAccessBase use DBConnRef, rename $wiki, and hide getLoadBalancer()"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQueryContributors.php
diff --git
a/includes/api/ApiQueryContributors.php
b/includes/api/ApiQueryContributors.php
index
a8f970e
..
a1945c4
100644
(file)
--- a/
includes/api/ApiQueryContributors.php
+++ b/
includes/api/ApiQueryContributors.php
@@
-152,7
+152,8
@@
class ApiQueryContributors extends ApiQueryBase {
} elseif ( $params['rights'] ) {
$excludeGroups = false;
foreach ( $params['rights'] as $r ) {
} elseif ( $params['rights'] ) {
$excludeGroups = false;
foreach ( $params['rights'] as $r ) {
- $limitGroups = array_merge( $limitGroups, User::getGroupsWithPermission( $r ) );
+ $limitGroups = array_merge( $limitGroups, $this->getPermissionManager()
+ ->getGroupsWithPermission( $r ) );
}
// If no group has the rights requested, no need to query
}
// If no group has the rights requested, no need to query
@@
-168,7
+169,8
@@
class ApiQueryContributors extends ApiQueryBase {
} elseif ( $params['excluderights'] ) {
$excludeGroups = true;
foreach ( $params['excluderights'] as $r ) {
} elseif ( $params['excluderights'] ) {
$excludeGroups = true;
foreach ( $params['excluderights'] as $r ) {
- $limitGroups = array_merge( $limitGroups, User::getGroupsWithPermission( $r ) );
+ $limitGroups = array_merge( $limitGroups, $this->getPermissionManager()
+ ->getGroupsWithPermission( $r ) );
}
}
}
}
@@
-176,7
+178,7
@@
class ApiQueryContributors extends ApiQueryBase {
$limitGroups = array_unique( $limitGroups );
$this->addTables( 'user_groups' );
$this->addJoinConds( [ 'user_groups' => [
$limitGroups = array_unique( $limitGroups );
$this->addTables( 'user_groups' );
$this->addJoinConds( [ 'user_groups' => [
- $excludeGroups ? 'LEFT
OUTER JOIN' : 'INNER
JOIN',
+ $excludeGroups ? 'LEFT
JOIN' : '
JOIN',
[
'ug_user=' . $revQuery['fields']['rev_user'],
'ug_group' => $limitGroups,
[
'ug_user=' . $revQuery['fields']['rev_user'],
'ug_group' => $limitGroups,
@@
-229,7
+231,7
@@
class ApiQueryContributors extends ApiQueryBase {
public function getAllowedParams() {
$userGroups = User::getAllGroups();
public function getAllowedParams() {
$userGroups = User::getAllGroups();
- $userRights =
User::getAllRight
s();
+ $userRights =
$this->getPermissionManager()->getAllPermission
s();
return [
'group' => [
return [
'group' => [