From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 27 Dec 2014 15:41:37 +0100
Subject: Update to MediaWiki 1.24.1

---
 languages/classes/LanguageZh.php | 44 ++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 18 deletions(-)

(limited to 'languages/classes/LanguageZh.php')

diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index d4130183..67f8769b 100644
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -28,14 +28,13 @@ require_once __DIR__ . '/LanguageZh_hans.php';
  * @ingroup Language
  */
 class ZhConverter extends LanguageConverter {
-
 	/**
-	 * @param $langobj Language
-	 * @param $maincode string
-	 * @param $variants array
-	 * @param $variantfallbacks array
-	 * @param $flags array
-	 * @param $manualLevel array
+	 * @param Language $langobj
+	 * @param string $maincode
+	 * @param array $variants
+	 * @param array $variantfallbacks
+	 * @param array $flags
+	 * @param array $manualLevel
 	 */
 	function __construct( $langobj, $maincode,
 								$variants = array(),
@@ -88,8 +87,8 @@ class ZhConverter extends LanguageConverter {
 	}
 
 	/**
-	 * @param $key string
-	 * @return String
+	 * @param string $key
+	 * @return string
 	 */
 	function convertCategoryKey( $key ) {
 		return $this->autoConvert( $key, 'zh' );
@@ -103,12 +102,22 @@ class ZhConverter extends LanguageConverter {
  * @ingroup Language
  */
 class LanguageZh extends LanguageZh_hans {
-
 	function __construct() {
 		global $wgHooks;
+
 		parent::__construct();
 
-		$variants = array( 'zh', 'zh-hans', 'zh-hant', 'zh-cn', 'zh-hk', 'zh-mo', 'zh-my', 'zh-sg', 'zh-tw' );
+		$variants = array(
+			'zh',
+			'zh-hans',
+			'zh-hant',
+			'zh-cn',
+			'zh-hk',
+			'zh-mo',
+			'zh-my',
+			'zh-sg',
+			'zh-tw'
+		);
 
 		$variantfallbacks = array(
 			'zh' => array( 'zh-hans', 'zh-hant', 'zh-cn', 'zh-tw', 'zh-hk', 'zh-sg', 'zh-mo', 'zh-my' ),
@@ -138,7 +147,7 @@ class LanguageZh extends LanguageZh_hans {
 	/**
 	 * this should give much better diff info
 	 *
-	 * @param $text string
+	 * @param string $text
 	 * @return string
 	 */
 	function segmentForDiff( $text ) {
@@ -146,7 +155,7 @@ class LanguageZh extends LanguageZh_hans {
 	}
 
 	/**
-	 * @param $text string
+	 * @param string $text
 	 * @return string
 	 */
 	function unsegmentForDiff( $text ) {
@@ -156,9 +165,9 @@ class LanguageZh extends LanguageZh_hans {
 	/**
 	 * auto convert to zh-hans and normalize special characters.
 	 *
-	 * @param $string String
-	 * @param $autoVariant String, default to 'zh-hans'
-	 * @return String
+	 * @param string $string
+	 * @param string $autoVariant Defaults to 'zh-hans'
+	 * @return string
 	 */
 	function normalizeForSearch( $string, $autoVariant = 'zh-hans' ) {
 		wfProfileIn( __METHOD__ );
@@ -176,7 +185,7 @@ class LanguageZh extends LanguageZh_hans {
 	}
 
 	/**
-	 * @param $termsArray array
+	 * @param array $termsArray
 	 * @return array
 	 */
 	function convertForSearchResult( $termsArray ) {
@@ -187,4 +196,3 @@ class LanguageZh extends LanguageZh_hans {
 		return $ret;
 	}
 }
-
-- 
cgit v1.2.3-54-g00ecf