diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
| commit | 6dc1997577fab2c366781fd7048144935afa0012 (patch) | |
| tree | 8918d28c7ab4342f0738985e37af1dfc42d0e93a /includes/api/ApiQueryUsers.php | |
| parent | 150f94f051128f367bc89f6b7e5f57eb2a69fc62 (diff) | |
| parent | fa89acd685cb09cdbe1c64cbb721ec64975bbbc1 (diff) | |
Merge commit 'fa89acd'
# Conflicts:
# .gitignore
# extensions/ArchInterWiki.sql
Diffstat (limited to 'includes/api/ApiQueryUsers.php')
| -rw-r--r-- | includes/api/ApiQueryUsers.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php index f22c2134..1d0048ce 100644 --- a/includes/api/ApiQueryUsers.php +++ b/includes/api/ApiQueryUsers.php @@ -193,9 +193,9 @@ class ApiQueryUsers extends ApiQueryBase { $data[$name]['hidden'] = true; } if ( isset( $this->prop['blockinfo'] ) && !is_null( $row->ipb_by_text ) ) { - $data[$name]['blockid'] = $row->ipb_id; + $data[$name]['blockid'] = (int)$row->ipb_id; $data[$name]['blockedby'] = $row->ipb_by_text; - $data[$name]['blockedbyid'] = $row->ipb_by; + $data[$name]['blockedbyid'] = (int)$row->ipb_by; $data[$name]['blockedtimestamp'] = wfTimestamp( TS_ISO_8601, $row->ipb_timestamp ); $data[$name]['blockreason'] = $row->ipb_reason; $data[$name]['blockexpiry'] = $row->ipb_expiry; @@ -305,7 +305,8 @@ class ApiQueryUsers extends ApiQueryBase { 'registration', 'emailable', 'gender', - ) + ), + ApiBase::PARAM_HELP_MSG_PER_VALUE => array(), ), 'users' => array( ApiBase::PARAM_ISMULTI => true |