X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryContributors.php;h=f2e306fe8352831e68d2952e1ac4b9803614610e;hb=23707d999dc0d225ede7a2a9dc9639300423042a;hp=9057f1055b6ee6952aeae9cf2fd10cd9d9bdf3be;hpb=9101bf588bc2a2537f91a62fca84cf52ab186f5d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryContributors.php b/includes/api/ApiQueryContributors.php
index 9057f1055b..f2e306fe83 100644
--- a/includes/api/ApiQueryContributors.php
+++ b/includes/api/ApiQueryContributors.php
@@ -46,8 +46,6 @@ class ApiQueryContributors extends ApiQueryBase {
 	}
 
 	public function execute() {
-		global $wgActorTableSchemaMigrationStage;
-
 		$db = $this->getDB();
 		$params = $this->extractRequestParams();
 		$this->requireMaxOneParameter( $params, 'group', 'excludegroup', 'rights', 'excluderights' );
@@ -80,14 +78,10 @@ class ApiQueryContributors extends ApiQueryBase {
 		$result = $this->getResult();
 		$revQuery = MediaWikiServices::getInstance()->getRevisionStore()->getQueryInfo();
 
-		// For SCHEMA_COMPAT_READ_NEW, target indexes on the
-		// revision_actor_temp table, otherwise on the revision table.
-		$pageField = ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_READ_NEW )
-			? 'revactor_page' : 'rev_page';
-		$idField = ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_READ_NEW )
-			? 'revactor_actor' : $revQuery['fields']['rev_user'];
-		$countField = ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_READ_NEW )
-			? 'revactor_actor' : $revQuery['fields']['rev_user_text'];
+		// Target indexes on the revision_actor_temp table.
+		$pageField = 'revactor_page';
+		$idField = 'revactor_actor';
+		$countField = 'revactor_actor';
 
 		// First, count anons
 		$this->addTables( $revQuery['tables'] );
@@ -152,7 +146,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 +163,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 ) );
 			}
 		}
 
@@ -229,7 +225,7 @@ class ApiQueryContributors extends ApiQueryBase {
 
 	public function getAllowedParams() {
 		$userGroups = User::getAllGroups();
-		$userRights = User::getAllRights();
+		$userRights = $this->getPermissionManager()->getAllPermissions();
 
 		return [
 			'group' => [