X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryAllUsers.php;h=a7d4fb90a09a7bf6ee899d42c2a894325fcc297a;hb=a5deeac58c9fbfd989f460827103aefed6bb2c14;hp=023b88fea9fe1d99251cb961990f0c2b49cfc451;hpb=4858f8afdabb2a1d7c60b7c14b6f4d398056c07e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index 023b88fea9..a7d4fb90a0 100644
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -41,8 +41,6 @@ class ApiQueryAllUsers extends ApiQueryBase {
 	}
 
 	public function execute() {
-		global $wgActorTableSchemaMigrationStage;
-
 		$params = $this->extractRequestParams();
 		$activeUserDays = $this->getConfig()->get( 'ActiveUserDays' );
 
@@ -181,22 +179,17 @@ class ApiQueryAllUsers extends ApiQueryBase {
 			] ] );
 
 			// Actually count the actions using a subquery (T66505 and T66507)
-			$tables = [ 'recentchanges' ];
-			$joins = [];
-			if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_READ_OLD ) {
-				$userCond = 'rc_user_text = user_name';
-			} else {
-				$tables[] = 'actor';
-				$joins['actor'] = [ 'JOIN', 'rc_actor = actor_id' ];
-				$userCond = 'actor_user = user_id';
-			}
+			$tables = [ 'recentchanges', 'actor' ];
+			$joins = [
+				'actor' => [ 'JOIN', 'rc_actor = actor_id' ],
+			];
 			$timestamp = $db->timestamp( wfTimestamp( TS_UNIX ) - $activeUserSeconds );
 			$this->addFields( [
 				'recentactions' => '(' . $db->selectSQLText(
 					$tables,
 					'COUNT(*)',
 					[
-						$userCond,
+						'actor_user = user_id',
 						'rc_type != ' . $db->addQuotes( RC_EXTERNAL ), // no wikidata
 						'rc_log_type IS NULL OR rc_log_type != ' . $db->addQuotes( 'newusers' ),
 						'rc_timestamp >= ' . $db->addQuotes( $timestamp ),
@@ -356,7 +349,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
 				ApiBase::PARAM_ISMULTI => true,
 			],
 			'rights' => [
-				ApiBase::PARAM_TYPE => User::getAllRights(),
+				ApiBase::PARAM_TYPE => $this->getPermissionManager()->getAllPermissions(),
 				ApiBase::PARAM_ISMULTI => true,
 			],
 			'prop' => [