Revert r87635, r87637, r87639, r87643 (MW_MIN_PHP_VERSION etc.): breaks HipHop support.

[lhc/web/wiklou.git] / includes / OutputPage.php

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 2c8bb23..6b079e6 100644 (file)
--- 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;
        }
 
        /**
@@ -2368,6 +2358,7 @@ class OutputPage {
                if( $this->getUser()->getBoolOption( 'editsectiononrightclick' ) ) {
                        $this->addModules( 'mediawiki.action.view.rightClickEdit' );
                }
+               $this->addModules( 'mediawiki.action.view.tablesorting' );
        }
 
        /**
@@ -2589,9 +2580,7 @@ class OutputPage {
                if ( $modules ) {
                        $scripts .= Html::inlineScript(
                                ResourceLoader::makeLoaderConditionalScript(
-                                       Xml::encodeJsCall( 'mw.loader.load', array( $modules ) ) .
-                                       // the go() call is unnecessary if we inserted top modules, but we don't know for sure that we did
-                                       Xml::encodeJsCall( 'mw.loader.go', array() )
+                                       Xml::encodeJsCall( 'mw.loader.load', array( $modules ) )
                                )
                        );
                }
@@ -2683,7 +2672,7 @@ class OutputPage {
         */
        public function getHeadLinks( Skin $sk, $addContentType = false ) {
                global $wgUniversalEditButton, $wgFavicon, $wgAppleTouchIcon, $wgEnableAPI,
-                       $wgSitename, $wgHtml5, $wgMimeType,
+                       $wgSitename, $wgVersion, $wgHtml5, $wgMimeType,
                        $wgFeed, $wgOverrideSiteFeed, $wgAdvertisedFeedTypes,
                        $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf,
                        $wgDisableLangConversion, $wgCanonicalLanguageLinks, $wgContLang,
@@ -2710,7 +2699,7 @@ class OutputPage {
 
                $tags[] = Html::element( 'meta', array(
                        'name' => 'generator',
-                       'content' => "MediaWiki " . MW_VERSION,
+                       'content' => "MediaWiki $wgVersion",
                ) );
 
                $p = "{$this->mIndexPolicy},{$this->mFollowPolicy}";