X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;ds=inline;f=languages%2FLanguage.php;h=d96710a6265972a79e913b093300eb0d850bb088;hb=fe86a19530e0ca255bc6e707743f4207458c3580;hp=37f4137a7eeecd16a80e238737b7739d4b416cd2;hpb=46272366d14254e0917a9de8688a7627354f4bdb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/Language.php b/languages/Language.php
index 37f4137a7e..d96710a626 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -2577,9 +2577,6 @@ class Language {
 	 * @return string
 	 */
 	public function iconv( $in, $out, $string ) {
-		# This is a wrapper for iconv in all languages except esperanto,
-		# which does some nasty x-conversions beforehand
-
 		# Even with //IGNORE iconv can whine about illegal characters in
 		# *input* string. We just ignore those too.
 		# REF: http://bugs.php.net/bug.php?id=37166
@@ -2929,46 +2926,29 @@ class Language {
 		}
 	}
 
+	/**
+	 * @deprecated No-op since 1.28
+	 */
 	function initEncoding() {
-		# Some languages may have an alternate char encoding option
-		# (Esperanto X-coding, Japanese furigana conversion, etc)
-		# If this language is used as the primary content language,
-		# an override to the defaults can be set here on startup.
+		// No-op.
 	}
 
 	/**
 	 * @param string $s
 	 * @return string
+	 * @deprecated No-op since 1.28
 	 */
 	function recodeForEdit( $s ) {
-		# For some languages we'll want to explicitly specify
-		# which characters make it into the edit box raw
-		# or are converted in some way or another.
-		global $wgEditEncoding;
-		if ( $wgEditEncoding == '' || $wgEditEncoding == 'UTF-8' ) {
-			return $s;
-		} else {
-			return $this->iconv( 'UTF-8', $wgEditEncoding, $s );
-		}
+		return $s;
 	}
 
 	/**
 	 * @param string $s
 	 * @return string
+	 * @deprecated No-op since 1.28
 	 */
 	function recodeInput( $s ) {
-		# Take the previous into account.
-		global $wgEditEncoding;
-		if ( $wgEditEncoding != '' ) {
-			$enc = $wgEditEncoding;
-		} else {
-			$enc = 'UTF-8';
-		}
-		if ( $enc == 'UTF-8' ) {
-			return $s;
-		} else {
-			return $this->iconv( $enc, 'UTF-8', $s );
-		}
+		return $s;
 	}
 
 	/**