From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 9 Feb 2012 18:53:35 +0000 (+0000)
Subject: Made loadFromFileCache() always disable $wgOut regardless of whether compression... 
X-Git-Tag: 1.31.0-rc.0~24823
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22lang_raccourcis%22%2C%22module=%24nom_module%22%29%20.%20%22?a=commitdiff_plain;h=18df3d63bdbc58a76bd20e0cdc2b13af7f053b8c;p=lhc%2Fweb%2Fwiklou.git

Made loadFromFileCache() always disable $wgOut regardless of whether compression is used
---

diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php
index 12e9b2d621..256df5759a 100644
--- a/includes/cache/HTMLFileCache.php
+++ b/includes/cache/HTMLFileCache.php
@@ -112,14 +112,13 @@ class HTMLFileCache extends FileCacheBase {
 		if ( $this->useGzip() ) {
 			if ( wfClientAcceptsGzip() ) {
 				header( 'Content-Encoding: gzip' );
+				readfile( $filename );
 			} else {
 				/* Send uncompressed */
 				wfDebug( __METHOD__ . " uncompressing cache file and sending it\n" );
 				readgzfile( $filename );
-				return;
 			}
 		}
-		readfile( $filename );
 		$context->getOutput()->disable(); // tell $wgOut that output is taken care of
 	}