X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fapi%2FApiQueryAllUsers.php;h=0ea6af3247d6eaa0e3e5f9a4f611f0705c638757;hb=a1ef77b2d80830fbcb617a83961d78cff9d6e384;hp=a7d4fb90a09a7bf6ee899d42c2a894325fcc297a;hpb=5d1b19ed478271f4ef3204f4a388eb39effb275f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index a7d4fb90a0..0ea6af3247 100644
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -20,12 +20,16 @@
  * @file
  */
 
+use MediaWiki\Block\DatabaseBlock;
+
 /**
  * Query module to enumerate all registered users.
  *
  * @ingroup API
  */
 class ApiQueryAllUsers extends ApiQueryBase {
+	use ApiQueryBlockInfoTrait;
+
 	public function __construct( ApiQuery $query, $moduleName ) {
 		parent::__construct( $query, $moduleName, 'au' );
 	}
@@ -153,7 +157,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
 			$this->addWhere( 'user_editcount > 0' );
 		}
 
-		$this->showHiddenUsersAddBlockInfo( $fld_blockinfo );
+		$this->addBlockInfoToQuery( $fld_blockinfo );
 
 		if ( $fld_groups || $fld_rights ) {
 			$this->addFields( [ 'groups' =>
@@ -263,13 +267,8 @@ class ApiQueryAllUsers extends ApiQueryBase {
 				);
 			}
 
-			if ( $fld_blockinfo && !is_null( $row->ipb_by_text ) ) {
-				$data['blockid'] = (int)$row->ipb_id;
-				$data['blockedby'] = $row->ipb_by_text;
-				$data['blockedbyid'] = (int)$row->ipb_by;
-				$data['blockedtimestamp'] = wfTimestamp( TS_ISO_8601, $row->ipb_timestamp );
-				$data['blockreason'] = $commentStore->getComment( 'ipb_reason', $row )->text;
-				$data['blockexpiry'] = $row->ipb_expiry;
+			if ( $fld_blockinfo && !is_null( $row->ipb_id ) ) {
+				$data += $this->getBlockDetails( DatabaseBlock::newFromRow( $row ) );
 			}
 			if ( $row->ipb_deleted ) {
 				$data['hidden'] = true;