From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 maintenance/language/languages.inc | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'maintenance/language/languages.inc')

diff --git a/maintenance/language/languages.inc b/maintenance/language/languages.inc
index dcd9b9b4..6070f4ab 100644
--- a/maintenance/language/languages.inc
+++ b/maintenance/language/languages.inc
@@ -43,10 +43,10 @@ class languages {
 	 * Load the list of languages: all the Messages*.php
 	 * files in the languages directory.
 	 *
-	 * @param $exif bool Treat the EXIF messages?
+	 * @param $exif bool Treat the Exif messages?
 	 */
 	function __construct( $exif = true ) {
-		require( __DIR__ . '/messageTypes.inc' );
+		require __DIR__ . '/messageTypes.inc';
 		$this->mIgnoredMessages = $wgIgnoredMessages;
 		if ( $exif ) {
 			$this->mOptionalMessages = array_merge( $wgOptionalMessages );
@@ -107,7 +107,7 @@ class languages {
 		$this->mSpecialPageAliases[$code] = array();
 		$filename = Language::getMessagesFileName( $code );
 		if ( file_exists( $filename ) ) {
-			require( $filename );
+			require $filename;
 			if ( isset( $messages ) ) {
 				$this->mRawMessages[$code] = $messages;
 			}
@@ -154,7 +154,7 @@ class languages {
 			if ( isset( $this->mGeneralMessages['required'][$key] ) ) {
 				$this->mMessages[$code]['required'][$key] = $value;
 				$this->mMessages[$code]['translated'][$key] = $value;
-			} else if ( isset( $this->mGeneralMessages['optional'][$key] ) ) {
+			} elseif ( isset( $this->mGeneralMessages['optional'][$key] ) ) {
 				$this->mMessages[$code]['optional'][$key] = $value;
 				$this->mMessages[$code]['translated'][$key] = $value;
 			} else {
@@ -184,7 +184,7 @@ class languages {
 		foreach ( $this->mGeneralMessages['all'] as $key => $value ) {
 			if ( in_array( $key, $this->mIgnoredMessages ) ) {
 				$this->mGeneralMessages['ignored'][$key] = $value;
-			} else if ( in_array( $key, $this->mOptionalMessages ) ) {
+			} elseif ( in_array( $key, $this->mOptionalMessages ) ) {
 				$this->mGeneralMessages['optional'][$key] = $value;
 				$this->mGeneralMessages['translatable'][$key] = $value;
 			} else {
@@ -466,11 +466,11 @@ class languages {
 			'[POP]' => "\xE2\x80\xAC",
 			'[LRO]' => "\xE2\x80\xAD",
 			'[RLO]' => "\xE2\x80\xAB",
-			'[ZWSP]'=> "\xE2\x80\x8B",
-			'[NBSP]'=> "\xC2\xA0",
-			'[WJ]'  => "\xE2\x81\xA0",
+			'[ZWSP]' => "\xE2\x80\x8B",
+			'[NBSP]' => "\xC2\xA0",
+			'[WJ]' => "\xE2\x81\xA0",
 			'[BOM]' => "\xEF\xBB\xBF",
-			'[FFFD]'=> "\xEF\xBF\xBD",
+			'[FFFD]' => "\xEF\xBF\xBD",
 		);
 		$wrongRegExp = '/(' . implode( '|', array_values( $wrongChars ) ) . ')/sDu';
 		$wrongCharsMessages = array();
@@ -500,8 +500,8 @@ class languages {
 		foreach ( $this->mMessages[$code]['translated'] as $key => $value ) {
 			$matches = array();
 			preg_match_all( "/\[\[([{$tc}]+)(?:\\|(.+?))?]]/sDu", $value, $matches );
-			for ($i = 0; $i < count($matches[0]); $i++ ) {
-				if ( preg_match( "/.*project.*/isDu",  $matches[1][$i] ) ) {
+			for ( $i = 0; $i < count( $matches[0] ); $i++ ) {
+				if ( preg_match( "/.*project.*/isDu", $matches[1][$i] ) ) {
 					$messages[$key][] = $matches[0][$i];
 				}
 			}
@@ -563,7 +563,9 @@ class languages {
 		$this->loadFile( 'en' );
 		$this->loadFile( $code );
 		$namespacesDiff = array_diff_key( $this->mNamespaceNames['en'], $this->mNamespaceNames[$code] );
-		if ( isset( $namespacesDiff[NS_MAIN] ) ) unset( $namespacesDiff[NS_MAIN] );
+		if ( isset( $namespacesDiff[NS_MAIN] ) ) {
+			unset( $namespacesDiff[NS_MAIN] );
+		}
 		return $namespacesDiff;
 	}
 
@@ -579,7 +581,7 @@ class languages {
 		$namespaces = array();
 
 		# Check default namespace name
-		if( isset( $this->mNamespaceNames[$code][NS_PROJECT_TALK] ) ) {
+		if ( isset( $this->mNamespaceNames[$code][NS_PROJECT_TALK] ) ) {
 			$default = $this->mNamespaceNames[$code][NS_PROJECT_TALK];
 			if ( strpos( $default, '$1' ) === false ) {
 				$namespaces[$default] = 'default';
@@ -587,7 +589,7 @@ class languages {
 		}
 
 		# Check namespace aliases
-		foreach( $this->mNamespaceAliases[$code] as $key => $value ) {
+		foreach ( $this->mNamespaceAliases[$code] as $key => $value ) {
 			if ( $value == NS_PROJECT_TALK && strpos( $key, '$1' ) === false ) {
 				$namespaces[$key] = '';
 			}
@@ -758,9 +760,9 @@ class extensionLanguages extends languages {
 	 * @param $code string The language code.
 	 */
 	protected function loadFile( $code ) {
-		if( !isset( $this->mRawMessages[$code] ) ) {
+		if ( !isset( $this->mRawMessages[$code] ) ) {
 			$this->mRawMessages[$code] = $this->mMessageGroup->load( $code );
-			if( empty( $this->mRawMessages[$code] ) ) {
+			if ( empty( $this->mRawMessages[$code] ) ) {
 				$this->mRawMessages[$code] = array();
 			}
 		}
-- 
cgit v1.2.2