Removed OutputPage::setEncodings(); its current implementation just converts $wgInput...

So instead of playing with these variables, let's just remove that function.

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index a7f7e2d..6f62b11 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1702,21 +1702,6 @@ class OutputPage {
                print $outs;
        }
 
-       /**
-        * @todo document
-        */
-       public static function setEncodings() {
-               global $wgInputEncoding, $wgOutputEncoding;
-
-               $wgInputEncoding = strtolower( $wgInputEncoding );
-
-               if ( empty( $_SERVER['HTTP_ACCEPT_CHARSET'] ) ) {
-                       $wgOutputEncoding = strtolower( $wgOutputEncoding );
-                       return;
-               }
-               $wgOutputEncoding = $wgInputEncoding;
-       }
-
        /**
         * @deprecated use wfReportTime() instead.
         *

diff --git a/index.php b/index.php
index 9f4dedd..7c61f77 100644 (file)
--- a/index.php
+++ b/index.php
@@ -44,7 +44,6 @@ require_once( "$preIP/includes/WebStart.php" );
 $mediaWiki = new MediaWiki();
 
 wfProfileIn( 'main-misc-setup' );
-OutputPage::setEncodings(); # Not really used yet
 
 $maxLag = $wgRequest->getVal( 'maxlag' );
 if( !is_null( $maxLag ) && !$mediaWiki->checkMaxLag( $maxLag ) ) {

diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php
index 7f250bc..ff059d8 100644 (file)
--- a/maintenance/rebuildFileCache.php
+++ b/maintenance/rebuildFileCache.php
@@ -54,7 +54,6 @@ class RebuildFileCache extends Maintenance {
                }
 
                $_SERVER['HTTP_ACCEPT_ENCODING'] = 'bgzip'; // hack, no real client
-               OutputPage::setEncodings(); # Not really used yet
 
                # Do remaining chunk
                $end += $this->mBatchSize - 1;