Merge branch 'archwiki'

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

1 files changed, 11 insertions, 31 deletions

diff --git a/languages/classes/LanguageShi.php b/languages/classes/LanguageShi.php
index f4180cb8..105a3af7 100644
--- a/languages/classes/LanguageShi.php
+++ b/languages/classes/LanguageShi.php
@@ -36,7 +36,6 @@ require_once __DIR__ . '/../LanguageConverter.php';
  * @ingroup Language
  */
 class ShiConverter extends LanguageConverter {
-
 	protected $mDoContentConvert;
 
 	public $mToLatin = array(
@@ -81,8 +80,8 @@ class ShiConverter extends LanguageConverter {
 	 * update: delete all rule parsing because it's not used
 	 * currently, and just produces a couple of bugs
 	 *
-	 * @param $rule string
-	 * @param $flags array
+	 * @param string $rule
+	 * @param array $flags
 	 * @return array
 	 */
 	function parseManualRule( $rule, $flags = array() ) {
@@ -102,12 +101,13 @@ class ShiConverter extends LanguageConverter {
 	/**
 	 * Do not convert content on talk pages
 	 *
-	 * @param $text string
-	 * @param $parser Parser
+	 * @param string $text
+	 * @param Parser $parser
 	 * @return string
 	 */
 	function parserConvert( $text, &$parser ) {
-		$this->mDoContentConvert = !( is_object( $parser->getTitle() ) && $parser->getTitle()->isTalkPage() );
+		$this->mDoContentConvert = !( is_object( $parser->getTitle() )
+			&& $parser->getTitle()->isTalkPage() );
 
 		return parent::parserConvert( $text, $parser );
 	}
@@ -118,9 +118,9 @@ class ShiConverter extends LanguageConverter {
 	 *     names as they were
 	 *   - do not try to find variants for usernames
 	 *
-	 * @param $link string
-	 * @param $nt Title
-	 * @param $ignoreOtherCond bool
+	 * @param string &$link
+	 * @param Title &$nt
+	 * @param bool $ignoreOtherCond
 	 */
 	function findVariantLink( &$link, &$nt, $ignoreOtherCond = false ) {
 		// check for user namespace
@@ -139,30 +139,10 @@ class ShiConverter extends LanguageConverter {
 	}
 
 	/**
-	 * An ugly function wrapper for parsing Image titles
-	 * (to prevent image name conversion)
-	 *
-	 * @param $text string
-	 * @param $toVariant bool
-	 *
-	 * @return string
-	 */
-	function autoConvert( $text, $toVariant = false ) {
-		global $wgTitle;
-		if ( is_object( $wgTitle ) && $wgTitle->getNamespace() == NS_FILE ) {
-			$imagename = $wgTitle->getNsText();
-			if ( preg_match( "/^$imagename:/", $text ) ) {
-				return $text;
-			}
-		}
-		return parent::autoConvert( $text, $toVariant );
-	}
-
-	/**
 	 * It translates text into variant
 	 *
-	 * @param $text string
-	 * @param $toVariant string
+	 * @param string $text
+	 * @param string $toVariant
 	 *
 	 * @return string
 	 */