X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryAllMessages.php;h=e0ba4ea1c19c27287c11470f20e854b9a54fa31b;hb=a3b1ef7c21ba9af94f611f6ca1d64e75710db176;hp=d8a71caf41dd6e3932247ad1dcc4b8076309968c;hpb=ea9fcc1e4d3b572199d82c426024e3e5efe23879;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryAllMessages.php b/includes/api/ApiQueryAllMessages.php
index d8a71caf41..e0ba4ea1c1 100644
--- a/includes/api/ApiQueryAllMessages.php
+++ b/includes/api/ApiQueryAllMessages.php
@@ -50,7 +50,7 @@ class ApiQueryAllMessages extends ApiQueryBase {
 			if ( !is_null( $params['title'] ) ) {
 				$title = Title::newFromText( $params['title'] );
 				if ( !$title || $title->isExternal() ) {
-					$this->dieUsageMsg( array( 'invalidtitle', $params['title'] ) );
+					$this->dieUsageMsg( [ 'invalidtitle', $params['title'] ] );
 				}
 			} else {
 				$title = Title::newFromText( 'API' );
@@ -82,7 +82,7 @@ class ApiQueryAllMessages extends ApiQueryBase {
 		// Because we sorted the message array earlier, they will appear in a clump:
 		if ( isset( $params['prefix'] ) ) {
 			$skip = false;
-			$messages_filtered = array();
+			$messages_filtered = [];
 			foreach ( $messages_target as $message ) {
 				// === 0: must be at beginning of string (position 0)
 				if ( strpos( $message, $params['prefix'] ) === 0 ) {
@@ -99,7 +99,7 @@ class ApiQueryAllMessages extends ApiQueryBase {
 
 		// Filter messages that contain specified string
 		if ( isset( $params['filter'] ) ) {
-			$messages_filtered = array();
+			$messages_filtered = [];
 			foreach ( $messages_target as $message ) {
 				// !== is used because filter can be at the beginning of the string
 				if ( strpos( $message, $params['filter'] ) !== false ) {
@@ -113,15 +113,14 @@ class ApiQueryAllMessages extends ApiQueryBase {
 		$customiseFilterEnabled = $params['customised'] !== 'all';
 		if ( $customiseFilterEnabled ) {
 			global $wgContLang;
-			$lang = $langObj->getCode();
 
 			$customisedMessages = AllMessagesTablePager::getCustomisedStatuses(
 				array_map(
-					array( $langObj, 'ucfirst' ),
+					[ $langObj, 'ucfirst' ],
 					$messages_target
 				),
-				$lang,
-				$lang != $wgContLang->getCode()
+				$langObj->getCode(),
+				!$langObj->equals( $wgContLang )
 			);
 
 			$customised = $params['customised'] === 'modified';
@@ -142,12 +141,12 @@ class ApiQueryAllMessages extends ApiQueryBase {
 			}
 
 			if ( !$skip ) {
-				$a = array(
+				$a = [
 					'name' => $message,
 					'normalizedname' => MessageCache::normalizeKey( $message ),
-				);
+				];
 
-				$args = array();
+				$args = [];
 				if ( isset( $params['args'] ) && count( $params['args'] ) != 0 ) {
 					$args = $params['args'];
 				}
@@ -186,14 +185,14 @@ class ApiQueryAllMessages extends ApiQueryBase {
 						}
 					}
 				}
-				$fit = $result->addValue( array( 'query', $this->getModuleName() ), null, $a );
+				$fit = $result->addValue( [ 'query', $this->getModuleName() ], null, $a );
 				if ( !$fit ) {
 					$this->setContinueEnumParameter( 'from', $message );
 					break;
 				}
 			}
 		}
-		$result->addIndexedTagName( array( 'query', $this->getModuleName() ), 'message' );
+		$result->addIndexedTagName( [ 'query', $this->getModuleName() ], 'message' );
 	}
 
 	public function getCacheMode( $params ) {
@@ -210,48 +209,48 @@ class ApiQueryAllMessages extends ApiQueryBase {
 	}
 
 	public function getAllowedParams() {
-		return array(
-			'messages' => array(
+		return [
+			'messages' => [
 				ApiBase::PARAM_DFLT => '*',
 				ApiBase::PARAM_ISMULTI => true,
-			),
-			'prop' => array(
+			],
+			'prop' => [
 				ApiBase::PARAM_ISMULTI => true,
-				ApiBase::PARAM_TYPE => array(
+				ApiBase::PARAM_TYPE => [
 					'default'
-				)
-			),
+				]
+			],
 			'enableparser' => false,
 			'nocontent' => false,
 			'includelocal' => false,
-			'args' => array(
+			'args' => [
 				ApiBase::PARAM_ISMULTI => true,
 				ApiBase::PARAM_ALLOW_DUPLICATES => true,
-			),
-			'filter' => array(),
-			'customised' => array(
+			],
+			'filter' => [],
+			'customised' => [
 				ApiBase::PARAM_DFLT => 'all',
-				ApiBase::PARAM_TYPE => array(
+				ApiBase::PARAM_TYPE => [
 					'all',
 					'modified',
 					'unmodified'
-				)
-			),
+				]
+			],
 			'lang' => null,
 			'from' => null,
 			'to' => null,
 			'title' => null,
 			'prefix' => null,
-		);
+		];
 	}
 
 	protected function getExamplesMessages() {
-		return array(
+		return [
 			'action=query&meta=allmessages&amprefix=ipb-'
 				=> 'apihelp-query+allmessages-example-ipb',
 			'action=query&meta=allmessages&ammessages=august|mainpage&amlang=de'
 				=> 'apihelp-query+allmessages-example-de',
-		);
+		];
 	}
 
 	public function getHelpUrls() {