X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fapi%2FApiQueryContributors.php;h=93cf01624350a748cb852baec85fe2d52da2da89;hb=54c93f1d384cd5accd2db2ebbb911e4d627c2980;hp=a8f970e17067f75ca44478151056d751a53f899a;hpb=8d4eb29b3d7da5f25a95ddfdaf17d272c476d999;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/api/ApiQueryContributors.php b/includes/api/ApiQueryContributors.php index a8f970e170..a1945c4a81 100644 --- 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 ) { - $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 @@ -168,7 +169,8 @@ class ApiQueryContributors extends ApiQueryBase { } 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' => [ - $excludeGroups ? 'LEFT OUTER JOIN' : 'INNER JOIN', + $excludeGroups ? 'LEFT JOIN' : 'JOIN', [ 'ug_user=' . $revQuery['fields']['rev_user'], 'ug_group' => $limitGroups, @@ -229,7 +231,7 @@ class ApiQueryContributors extends ApiQueryBase { public function getAllowedParams() { $userGroups = User::getAllGroups(); - $userRights = User::getAllRights(); + $userRights = $this->getPermissionManager()->getAllPermissions(); return [ 'group' => [