Follow-up r87589: let's simplify this a bit :P
authorAlexandre Emsenhuber <ialex@users.mediawiki.org>
Sat, 14 May 2011 17:02:37 +0000 (17:02 +0000)
committerAlexandre Emsenhuber <ialex@users.mediawiki.org>
Sat, 14 May 2011 17:02:37 +0000 (17:02 +0000)
includes/OutputPage.php

index daed70a..d6c978f 100644 (file)
@@ -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;
        }
 
        /**