X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryInfo.php;h=fd6503801f7761b5630b6561fa9ea0d827df14c6;hb=c6d1ceb90a9684fa0da758d88ba1e994fad4cffc;hp=d28702053625f96e5e7ac081dc98ad97531452df;hpb=d24af42ffff087a0824f6e9abefa33cab3e4e835;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php
index d287020536..6b8f98c7b9 100644
--- a/includes/api/ApiQueryInfo.php
+++ b/includes/api/ApiQueryInfo.php
@@ -427,7 +427,7 @@ class ApiQueryInfo extends ApiQueryBase {
 			foreach ( $this->params['token'] as $t ) {
 				$val = call_user_func( $tokenFunctions[$t], $pageid, $title );
 				if ( $val === false ) {
-					$this->setWarning( "Action '$t' is not allowed for the current user" );
+					$this->addWarning( [ 'apiwarn-tokennotallowed', $t ] );
 				} else {
 					$pageInfo[$t . 'token'] = $val;
 				}
@@ -535,7 +535,6 @@ class ApiQueryInfo extends ApiQueryBase {
 	 * Get information about protections and put it in $protections
 	 */
 	private function getProtectionInfo() {
-		global $wgContLang;
 		$this->protections = [];
 		$db = $this->getDB();
 
@@ -554,7 +553,7 @@ class ApiQueryInfo extends ApiQueryBase {
 				$a = [
 					'type' => $row->pr_type,
 					'level' => $row->pr_level,
-					'expiry' => $wgContLang->formatExpiry( $row->pr_expiry, TS_ISO_8601 )
+					'expiry' => ApiResult::formatExpiry( $row->pr_expiry )
 				];
 				if ( $row->pr_cascade ) {
 					$a['cascade'] = true;
@@ -614,7 +613,7 @@ class ApiQueryInfo extends ApiQueryBase {
 				$this->protections[$row->pt_namespace][$row->pt_title][] = [
 					'type' => 'create',
 					'level' => $row->pt_create_perm,
-					'expiry' => $wgContLang->formatExpiry( $row->pt_expiry, TS_ISO_8601 )
+					'expiry' => ApiResult::formatExpiry( $row->pt_expiry )
 				];
 			}
 		}
@@ -652,7 +651,7 @@ class ApiQueryInfo extends ApiQueryBase {
 				$this->protections[$row->tl_namespace][$row->tl_title][] = [
 					'type' => $row->pr_type,
 					'level' => $row->pr_level,
-					'expiry' => $wgContLang->formatExpiry( $row->pr_expiry, TS_ISO_8601 ),
+					'expiry' => ApiResult::formatExpiry( $row->pr_expiry ),
 					'source' => $source->getPrefixedText()
 				];
 			}
@@ -675,7 +674,7 @@ class ApiQueryInfo extends ApiQueryBase {
 				$this->protections[NS_FILE][$row->il_to][] = [
 					'type' => $row->pr_type,
 					'level' => $row->pr_level,
-					'expiry' => $wgContLang->formatExpiry( $row->pr_expiry, TS_ISO_8601 ),
+					'expiry' => ApiResult::formatExpiry( $row->pr_expiry ),
 					'source' => $source->getPrefixedText()
 				];
 			}
@@ -767,7 +766,7 @@ class ApiQueryInfo extends ApiQueryBase {
 		if ( $this->fld_watched ) {
 			foreach ( $timestamps as $namespaceId => $dbKeys ) {
 				$this->watched[$namespaceId] = array_map(
-					function( $x ) {
+					function ( $x ) {
 						return $x !== false;
 					},
 					$dbKeys
@@ -848,7 +847,7 @@ class ApiQueryInfo extends ApiQueryBase {
 				$timestamps[$row->page_namespace][$row->page_title] = $revTimestamp - $age;
 			}
 			$titlesWithThresholds = array_map(
-				function( LinkTarget $target ) use ( $timestamps ) {
+				function ( LinkTarget $target ) use ( $timestamps ) {
 					return [
 						$target, $timestamps[$target->getNamespace()][$target->getDBkey()]
 					];
@@ -861,7 +860,7 @@ class ApiQueryInfo extends ApiQueryBase {
 			$titlesWithThresholds = array_merge(
 				$titlesWithThresholds,
 				array_map(
-					function( LinkTarget $target ) {
+					function ( LinkTarget $target ) {
 						return [ $target, null ];
 					},
 					$this->missing
@@ -947,6 +946,6 @@ class ApiQueryInfo extends ApiQueryBase {
 	}
 
 	public function getHelpUrls() {
-		return 'https://www.mediawiki.org/wiki/API:Info';
+		return 'https://www.mediawiki.org/wiki/Special:MyLanguage/API:Info';
 	}
 }