diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
commit | a2190ac74dd4d7080b12bab90e552d7aa81209ef (patch) | |
tree | 8b31f38de9882d18df54cf8d9e0de74167a094eb /includes/api/ApiProtect.php | |
parent | 15e69f7b20b6596b9148030acce5b59993b95a45 (diff) | |
parent | 257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (diff) |
Merge branch 'mw-1.26'
Diffstat (limited to 'includes/api/ApiProtect.php')
-rw-r--r-- | includes/api/ApiProtect.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/includes/api/ApiProtect.php b/includes/api/ApiProtect.php index ad028375..c07aaca4 100644 --- a/includes/api/ApiProtect.php +++ b/includes/api/ApiProtect.php @@ -29,6 +29,8 @@ */ class ApiProtect extends ApiBase { public function execute() { + global $wgContLang; + $params = $this->extractRequestParams(); $pageObj = $this->getTitleOrPageId( $params, 'fromdbmaster' ); @@ -78,7 +80,7 @@ class ApiProtect extends ApiBase { } if ( wfIsInfinity( $expiry[$i] ) ) { - $expiryarray[$p[0]] = $db->getInfinity(); + $expiryarray[$p[0]] = 'infinity'; } else { $exp = strtotime( $expiry[$i] ); if ( $exp < 0 || !$exp ) { @@ -93,10 +95,7 @@ class ApiProtect extends ApiBase { } $resultProtections[] = array( $p[0] => $protections[$p[0]], - 'expiry' => ( $expiryarray[$p[0]] == $db->getInfinity() - ? 'infinite' - : wfTimestamp( TS_ISO_8601, $expiryarray[$p[0]] ) - ) + 'expiry' => $wgContLang->formatExpiry( $expiryarray[$p[0]], TS_ISO_8601, 'infinite' ), ); } |