Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 22 insertions, 24 deletions

diff --git a/languages/classes/LanguageGan.php b/languages/classes/LanguageGan.php
index d81574d1..a012f594 100644
--- a/languages/classes/LanguageGan.php
+++ b/languages/classes/LanguageGan.php
@@ -28,27 +28,26 @@ require_once __DIR__ . '/LanguageZh.php';
  * @ingroup Language
  */
 class GanConverter 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(),
-								$variantfallbacks = array(),
-								$flags = array(),
-								$manualLevel = array() ) {
+		$variants = array(),
+		$variantfallbacks = array(),
+		$flags = array(),
+		$manualLevel = array() ) {
 		$this->mDescCodeSep = '：';
 		$this->mDescVarSep = '；';
 		parent::__construct( $langobj, $maincode,
-									$variants,
-									$variantfallbacks,
-									$flags,
-									$manualLevel );
+			$variants,
+			$variantfallbacks,
+			$flags,
+			$manualLevel );
 		$names = array(
 			'gan' => '原文',
 			'gan-hans' => '简体',
@@ -67,8 +66,8 @@ class GanConverter extends LanguageConverter {
 	}
 
 	/**
-	 * @param $key string
-	 * @return String
+	 * @param string $key
+	 * @return string
 	 */
 	function convertCategoryKey( $key ) {
 		return $this->autoConvert( $key, 'gan' );
@@ -82,7 +81,6 @@ class GanConverter extends LanguageConverter {
  * @ingroup Language
  */
 class LanguageGan extends LanguageZh {
-
 	function __construct() {
 		global $wgHooks;
 		parent::__construct();
@@ -98,9 +96,9 @@ class LanguageGan extends LanguageZh {
 		);
 
 		$this->mConverter = new GanConverter( $this, 'gan',
-								$variants, $variantfallbacks,
-								array(),
-								$ml );
+			$variants, $variantfallbacks,
+			array(),
+			$ml );
 
 		$wgHooks['PageContentSaveComplete'][] = $this->mConverter;
 	}
@@ -108,9 +106,9 @@ class LanguageGan extends LanguageZh {
 	/**
 	 * word segmentation
 	 *
-	 * @param $string string
-	 * @param $autoVariant string
-	 * @return String
+	 * @param string $string
+	 * @param string $autoVariant
+	 * @return string
 	 */
 	function normalizeForSearch( $string, $autoVariant = 'gan-hans' ) {
 		// LanguageZh::normalizeForSearch