X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryUsers.php;h=fbf1f9ebfb999fd1d560d63630c43bde0f45e6b8;hb=996587e228e71436dc4bf2bceb41ce5a94e9288c;hp=a5d06c824cab57064f6e7786ea9ccc339f541a81;hpb=aae0c8d42562d5d3f70cc18fa687ae331996b66f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index a5d06c824c..fbf1f9ebfb 100644
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -99,6 +99,7 @@ class ApiQueryUsers extends ApiQueryBase {
 
 	public function execute() {
 		$db = $this->getDB();
+		$commentStore = new CommentStore( 'ipb_reason' );
 
 		$params = $this->extractRequestParams();
 		$this->requireMaxOneParameter( $params, 'userids', 'users' );
@@ -182,7 +183,6 @@ class ApiQueryUsers extends ApiQueryBase {
 			}
 
 			foreach ( $res as $row ) {
-
 				// create user object and pass along $userGroups if set
 				// that reduces the number of database queries needed in User dramatically
 				if ( !isset( $userGroups ) ) {
@@ -214,7 +214,7 @@ class ApiQueryUsers extends ApiQueryBase {
 				}
 
 				if ( isset( $this->prop['groupmemberships'] ) ) {
-					$data[$key]['groupmemberships'] = array_map( function( $ugm ) {
+					$data[$key]['groupmemberships'] = array_map( function ( $ugm ) {
 						return [
 							'group' => $ugm->getGroup(),
 							'expiry' => ApiResult::formatExpiry( $ugm->getExpiry() ),
@@ -237,7 +237,7 @@ class ApiQueryUsers extends ApiQueryBase {
 					$data[$key]['blockedby'] = $row->ipb_by_text;
 					$data[$key]['blockedbyid'] = (int)$row->ipb_by;
 					$data[$key]['blockedtimestamp'] = wfTimestamp( TS_ISO_8601, $row->ipb_timestamp );
-					$data[$key]['blockreason'] = $row->ipb_reason;
+					$data[$key]['blockreason'] = $commentStore->getComment( $row )->text;
 					$data[$key]['blockexpiry'] = $row->ipb_expiry;
 				}