Made loadFromFileCache() always disable $wgOut regardless of whether compression...

diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php
index 12e9b2d..256df57 100644 (file)
--- 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
        }