X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryUsers.php;h=66d8db4987b18d441aac97b4cf4074640f5426e4;hb=616525021b3691e30a980a42b837b7ad44ecfd09;hp=6de512b878594853c9a262d79a2c407091de426d;hpb=8a4a8a8dcbaf454c9f64cd8b5ba90704d7721500;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index 6de512b878..66d8db4987 100644
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -95,7 +95,7 @@ class ApiQueryUsers extends ApiQueryBase {
 
 	public function execute() {
 		$db = $this->getDB();
-		$commentStore = new CommentStore( 'ipb_reason' );
+		$commentStore = CommentStore::getStore();
 
 		$params = $this->extractRequestParams();
 		$this->requireMaxOneParameter( $params, 'userids', 'users' );
@@ -168,7 +168,7 @@ class ApiQueryUsers extends ApiQueryBase {
 				}
 
 				$this->addTables( 'user_groups' );
-				$this->addJoinConds( [ 'user_groups' => [ 'INNER JOIN', 'ug_user=user_id' ] ] );
+				$this->addJoinConds( [ 'user_groups' => [ 'JOIN', 'ug_user=user_id' ] ] );
 				$this->addFields( [ 'user_name' ] );
 				$this->addFields( UserGroupMembership::selectFields() );
 				$this->addWhere( 'ug_expiry IS NULL OR ug_expiry >= ' .
@@ -235,7 +235,8 @@ 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'] = $commentStore->getComment( $row )->text;
+					$data[$key]['blockreason'] = $commentStore->getComment( 'ipb_reason', $row )
+						->text;
 					$data[$key]['blockexpiry'] = $row->ipb_expiry;
 				}