From 18df3d63bdbc58a76bd20e0cdc2b13af7f053b8c Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 9 Feb 2012 18:53:35 +0000
Subject: [PATCH] Made loadFromFileCache() always disable $wgOut regardless of
 whether compression is used

---
 includes/cache/HTMLFileCache.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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
 	}
 
-- 
2.20.1