X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryImages.php;h=ae6f5bf564aa1ba3278fd97ddbd43062eba794d3;hb=e5e91cb0fa2c9d96c6ccac00d3d0c4760b2bccb1;hp=1b39d2827e4913294f12f6ee2488181044e23350;hpb=04af4fb8e7fcacd0e8556afffa6e5c4e3b3c6792;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryImages.php b/includes/api/ApiQueryImages.php
index 1b39d2827e..ae6f5bf564 100644
--- a/includes/api/ApiQueryImages.php
+++ b/includes/api/ApiQueryImages.php
@@ -53,10 +53,10 @@ class ApiQueryImages extends ApiQueryGeneratorBase {
 		}
 
 		$params = $this->extractRequestParams();
-		$this->addFields( array(
+		$this->addFields( [
 			'il_from',
 			'il_to'
-		) );
+		] );
 
 		$this->addTables( 'imagelinks' );
 		$this->addWhereFld( 'il_from', array_keys( $this->getPageSet()->getGoodTitles() ) );
@@ -78,19 +78,19 @@ class ApiQueryImages extends ApiQueryGeneratorBase {
 		if ( count( $this->getPageSet()->getGoodTitles() ) == 1 ) {
 			$this->addOption( 'ORDER BY', 'il_to' . $sort );
 		} else {
-			$this->addOption( 'ORDER BY', array(
+			$this->addOption( 'ORDER BY', [
 				'il_from' . $sort,
 				'il_to' . $sort
-			) );
+			] );
 		}
 		$this->addOption( 'LIMIT', $params['limit'] + 1 );
 
 		if ( !is_null( $params['images'] ) ) {
-			$images = array();
+			$images = [];
 			foreach ( $params['images'] as $img ) {
 				$title = Title::newFromText( $img );
 				if ( !$title || $title->getNamespace() != NS_FILE ) {
-					$this->setWarning( "\"$img\" is not a file" );
+					$this->addWarning( [ 'apiwarn-notfile', wfEscapeWikiText( $img ) ] );
 				} else {
 					$images[] = $title->getDBkey();
 				}
@@ -109,7 +109,7 @@ class ApiQueryImages extends ApiQueryGeneratorBase {
 					$this->setContinueEnumParameter( 'continue', $row->il_from . '|' . $row->il_to );
 					break;
 				}
-				$vals = array();
+				$vals = [];
 				ApiQueryBase::addTitleInfo( $vals, Title::makeTitle( NS_FILE, $row->il_to ) );
 				$fit = $this->addPageSubItem( $row->il_from, $vals );
 				if ( !$fit ) {
@@ -118,7 +118,7 @@ class ApiQueryImages extends ApiQueryGeneratorBase {
 				}
 			}
 		} else {
-			$titles = array();
+			$titles = [];
 			$count = 0;
 			foreach ( $res as $row ) {
 				if ( ++$count > $params['limit'] ) {
@@ -138,37 +138,37 @@ class ApiQueryImages extends ApiQueryGeneratorBase {
 	}
 
 	public function getAllowedParams() {
-		return array(
-			'limit' => array(
+		return [
+			'limit' => [
 				ApiBase::PARAM_DFLT => 10,
 				ApiBase::PARAM_TYPE => 'limit',
 				ApiBase::PARAM_MIN => 1,
 				ApiBase::PARAM_MAX => ApiBase::LIMIT_BIG1,
 				ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2
-			),
-			'continue' => array(
+			],
+			'continue' => [
 				ApiBase::PARAM_HELP_MSG => 'api-help-param-continue',
-			),
-			'images' => array(
+			],
+			'images' => [
 				ApiBase::PARAM_ISMULTI => true,
-			),
-			'dir' => array(
+			],
+			'dir' => [
 				ApiBase::PARAM_DFLT => 'ascending',
-				ApiBase::PARAM_TYPE => array(
+				ApiBase::PARAM_TYPE => [
 					'ascending',
 					'descending'
-				)
-			),
-		);
+				]
+			],
+		];
 	}
 
 	protected function getExamplesMessages() {
-		return array(
+		return [
 			'action=query&prop=images&titles=Main%20Page'
 				=> 'apihelp-query+images-example-simple',
 			'action=query&generator=images&titles=Main%20Page&prop=info'
 				=> 'apihelp-query+images-example-generator',
-		);
+		];
 	}
 
 	public function getHelpUrls() {