dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add parameter to API modules to apply change tags to log entries"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQueryBlocks.php
diff --git
a/includes/api/ApiQueryBlocks.php
b/includes/api/ApiQueryBlocks.php
index
ef79efd
..
0040860
100644
(file)
--- a/
includes/api/ApiQueryBlocks.php
+++ b/
includes/api/ApiQueryBlocks.php
@@
-36,8
+36,6
@@
class ApiQueryBlocks extends ApiQueryBase {
}
public function execute() {
}
public function execute() {
- global $wgContLang;
-
$db = $this->getDB();
$params = $this->extractRequestParams();
$this->requireMaxOneParameter( $params, 'users', 'ip' );
$db = $this->getDB();
$params = $this->extractRequestParams();
$this->requireMaxOneParameter( $params, 'users', 'ip' );
@@
-204,7
+202,7
@@
class ApiQueryBlocks extends ApiQueryBase {
$block['timestamp'] = wfTimestamp( TS_ISO_8601, $row->ipb_timestamp );
}
if ( $fld_expiry ) {
$block['timestamp'] = wfTimestamp( TS_ISO_8601, $row->ipb_timestamp );
}
if ( $fld_expiry ) {
- $block['expiry'] =
$wgContLang->formatExpiry( $row->ipb_expiry, TS_ISO_8601
);
+ $block['expiry'] =
ApiResult::formatExpiry( $row->ipb_expiry
);
}
if ( $fld_reason ) {
$block['reason'] = $row->ipb_reason;
}
if ( $fld_reason ) {
$block['reason'] = $row->ipb_reason;