From: withoutaname <drevitchi@gmail.com>
Date: Sat, 21 Jun 2014 02:02:11 +0000 (-0700)
Subject: Remove $wgTitle from LanguageConverter subclasses
X-Git-Tag: 1.31.0-rc.0~14666^2
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=69db8dc867c16ee52116f7f9b7178766ab358fbd;p=lhc%2Fweb%2Fwiklou.git

Remove $wgTitle from LanguageConverter subclasses

$wgTitle was simply used in these classes to prevent conversion
of prefixed names for files. Now that we have $wgNamespaceAliases
that is rendered moot, so this will instead return just the parent
class call for autoconvert().

Bug: 57562
Change-Id: I26f8a8aa0be3822056f286f2e15201cbe4d592bf
---

diff --git a/languages/classes/LanguageIu.php b/languages/classes/LanguageIu.php
index 4c956f011a..1d279d635f 100644
--- a/languages/classes/LanguageIu.php
+++ b/languages/classes/LanguageIu.php
@@ -162,26 +162,6 @@ class IuConverter extends LanguageConverter {
 		}
 	}
 
-	/**
-	 * An ugly function wrapper for parsing Image titles
-	 * (to prevent image name conversion)
-	 *
-	 * @param string $text
-	 * @param bool $toVariant
-	 *
-	 * @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
 	 *
diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php
index 1ab3c51507..3d05b81c92 100644
--- a/languages/classes/LanguageKk.php
+++ b/languages/classes/LanguageKk.php
@@ -270,26 +270,6 @@ class KkConverter extends LanguageConverter {
 		}
 	}
 
-	/**
-	 * An ugly function wrapper for parsing Image titles
-	 * (to prevent image name conversion)
-	 *
-	 * @param string $text
-	 * @param bool $toVariant
-	 *
-	 * @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
 	 *
diff --git a/languages/classes/LanguageKu.php b/languages/classes/LanguageKu.php
index 674e717a1f..f74be05e46 100644
--- a/languages/classes/LanguageKu.php
+++ b/languages/classes/LanguageKu.php
@@ -180,26 +180,6 @@ class KuConverter extends LanguageConverter {
 		}
 	}
 
-	/**
-	 * An ugly function wrapper for parsing Image titles
-	 * (to prevent image name conversion)
-	 *
-	 * @param string $text
-	 * @param bool $toVariant
-	 *
-	 * @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, specials:
 	 *    - ommiting roman numbers
diff --git a/languages/classes/LanguageShi.php b/languages/classes/LanguageShi.php
index 68e047c569..a22730c901 100644
--- a/languages/classes/LanguageShi.php
+++ b/languages/classes/LanguageShi.php
@@ -138,26 +138,6 @@ class ShiConverter extends LanguageConverter {
 		}
 	}
 
-	/**
-	 * An ugly function wrapper for parsing Image titles
-	 * (to prevent image name conversion)
-	 *
-	 * @param string $text
-	 * @param bool $toVariant
-	 *
-	 * @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
 	 *
diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php
index d0c4e06f10..80099ac140 100644
--- a/languages/classes/LanguageSr.php
+++ b/languages/classes/LanguageSr.php
@@ -128,26 +128,6 @@ class SrConverter extends LanguageConverter {
 		}
 	}
 
-	/**
-	 * An ugly function wrapper for parsing Image titles
-	 * (to prevent image name conversion)
-	 *
-	 * @param string $text
-	 * @param bool $toVariant
-	 *
-	 * @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, specials:
 	 *    - ommiting roman numbers