r111060 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r111059‎ | r111060 | r111061 >
Date:18:53, 9 February 2012
Author:aaron
Status:ok
Tags:core 
Comment:
Made loadFromFileCache() always disable $wgOut regardless of whether compression is used
Modified paths:
  • /trunk/phase3/includes/cache/HTMLFileCache.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/cache/HTMLFileCache.php
@@ -112,14 +112,13 @@
113113 if ( $this->useGzip() ) {
114114 if ( wfClientAcceptsGzip() ) {
115115 header( 'Content-Encoding: gzip' );
 116+ readfile( $filename );
116117 } else {
117118 /* Send uncompressed */
118119 wfDebug( __METHOD__ . " uncompressing cache file and sending it\n" );
119120 readgzfile( $filename );
120 - return;
121121 }
122122 }
123 - readfile( $filename );
124123 $context->getOutput()->disable(); // tell $wgOut that output is taken care of
125124 }
126125

Sign-offs

UserFlagDate
Nikerabbitinspected08:00, 10 February 2012

Status & tagging log