From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 14 May 2011 17:02:37 +0000 (+0000)
Subject: Follow-up r87589: let's simplify this a bit :P
X-Git-Tag: 1.31.0-rc.0~30189
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27votes%27%2C%20votes=%27waiting%27%29%20%7D%7D?a=commitdiff_plain;h=90845f429e7db0bd69f9188519d86dc744995b35;p=lhc%2Fweb%2Fwiklou.git

Follow-up r87589: let's simplify this a bit :P
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index daed70ad55..d6c978fb0b 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1912,22 +1912,12 @@ class OutputPage {
 	}
 
 	/**
-	 * Actually output something with print(). Performs an iconv to the
-	 * output encoding, if needed.
+	 * Actually output something with print().
 	 *
 	 * @param $ins String: the string to output
 	 */
 	public function out( $ins ) {
-		global $wgContLang;
-		if ( 0 == strcmp( 'UTF-8', 'UTF-8' ) ) {
-			$outs = $ins;
-		} else {
-			$outs = $wgContLang->iconv( 'UTF-8', 'UTF-8', $ins );
-			if ( false === $outs ) {
-				$outs = $ins;
-			}
-		}
-		print $outs;
+		print $ins;
 	}
 
 	/**