Stop testing hhvm 3.12 on travis

[lhc/web/wiklou.git] / includes / api / ApiQueryUsers.php

diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index 2a0eadd..8fc99bb 100644 (file)
--- 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' );
@@ -143,8 +144,10 @@ class ApiQueryUsers extends ApiQueryBase {
                $result = $this->getResult();
 
                if ( count( $parameters ) ) {
-                       $this->addTables( 'user' );
-                       $this->addFields( User::selectFields() );
+                       $userQuery = User::getQueryInfo();
+                       $this->addTables( $userQuery['tables'] );
+                       $this->addFields( $userQuery['fields'] );
+                       $this->addJoinConds( $userQuery['joins'] );
                        if ( $useNames ) {
                                $this->addWhereFld( 'user_name', $goodNames );
                        } else {
@@ -236,7 +239,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;
                                }