Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

API: Add timestamp of block to blockinfo

Browse source 
This change affects list=allusers, list=users
and meta=userinfo.

Note: This change also add block expiry to meta=userinfo.
Unlike this field in other modules, it formats the timestamp
properly, instead of just dumping db contents.

Resurrecting from abandoned change Ifdeac5c5f547

Bug: 63326
Change-Id: I4b3e55fe2d07271e1ded89d36d0b98de0e643177
This commit is contained in:
Derk-Jan Hartman 2014-03-31 23:17:20 +02:00 committed by Brian Wolff
parent b82a8a080a
commit d87164e91a
5 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES-1.24
View file

@ -256,6 +256,8 @@ production.
* New action ClearHasMsg that can be used to clear HasMsg flag.
* The cmstartsortkey and cmendsortkey parameters to list=categorymembers are
deprecated in favor of cmstarthexsortkey and cmendhexsortkey.
* (bug 63326) Add blockedtimestamp field to output of blockinfo property for
the list=allusers and list=users modules.
=== Action API internal changes in 1.24 ===
* Methods for handling continuation are added to ApiResult, so actions other

1
includes/api/ApiQueryAllUsers.php
View file

@ -239,6 +239,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
$lastUserData['blockid'] = $row->ipb_id;
$lastUserData['blockedby'] = $row->ipb_by_text;
$lastUserData['blockedbyid'] = $row->ipb_by;
$lastUserData['blockedtimestamp'] = wfTimestamp( TS_ISO_8601, $row->ipb_timestamp );
$lastUserData['blockreason'] = $row->ipb_reason;
$lastUserData['blockexpiry'] = $row->ipb_expiry;
}

2
includes/api/ApiQueryBase.php
View file

@ -414,7 +414,7 @@ abstract class ApiQueryBase extends ApiBase {
$this->addFields( 'ipb_deleted' );
if ( $showBlockInfo ) {
$this->addFields( array( 'ipb_id', 'ipb_by', 'ipb_by_text', 'ipb_reason', 'ipb_expiry' ) );
$this->addFields( array( 'ipb_id', 'ipb_by', 'ipb_by_text', 'ipb_reason', 'ipb_expiry', 'ipb_timestamp' ) );
}
// Don't show hidden names

4
includes/api/ApiQueryUserInfo.php
View file

@ -69,6 +69,10 @@ class ApiQueryUserInfo extends ApiQueryBase {
$vals['blockedby'] = $block->getByName();
$vals['blockedbyid'] = $block->getBy();
$vals['blockreason'] = $user->blockedFor();
$vals['blockedtimestamp'] = wfTimestamp( TS_ISO_8601, $block->mTimestamp );
$vals['blockexpiry'] = $block->getExpiry() === 'infinity'
? 'infinite'
: wfTimestamp( TS_ISO_8601, $block->getExpiry() );
}
}

1
includes/api/ApiQueryUsers.php
View file

@ -195,6 +195,7 @@ class ApiQueryUsers extends ApiQueryBase {
$data[$name]['blockid'] = $row->ipb_id;
$data[$name]['blockedby'] = $row->ipb_by_text;
$data[$name]['blockedbyid'] = $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;
}