From 1343d55200ff15e6b692771a26d88959392b3fe3 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Wed, 8 Dec 2010 08:03:52 +0000 Subject: [PATCH] Removed OutputPage::setEncodings(); its current implementation just converts $wgInputEncoding and $wgOutputEncoding to lowercase but the inclusion of Language.php will set them back to uppercase. So instead of playing with these variables, let's just remove that function. --- includes/OutputPage.php | 15 --------------- index.php | 1 - maintenance/rebuildFileCache.php | 1 - 3 files changed, 17 deletions(-) diff --git a/includes/OutputPage.php b/includes/OutputPage.php index a7f7e2d1dc..6f62b11b15 100644 --- 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 9f4dedd795..7c61f771fc 100644 --- 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 7f250bc07e..ff059d8502 100644 --- 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; -- 2.20.1