disable wgDebugToolbar when rebuilding file cache

credits to iAlex :)

diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php
index 37d0adc..6b19fdf 100644 (file)
--- a/includes/cache/HTMLFileCache.php
+++ b/includes/cache/HTMLFileCache.php
@@ -61,10 +61,15 @@ class HTMLFileCache extends FileCacheBase {
         * @return bool
         */
        public static function useFileCache( IContextSource $context ) {
-               global $wgUseFileCache, $wgShowIPinHeader, $wgContLang;
+               global $wgUseFileCache, $wgShowIPinHeader, $wgDebugToolbar, $wgContLang;
                if ( !$wgUseFileCache ) {
                        return false;
                }
+               if( $wgShowIPinHeader || $wgDebugToolbar ) {
+                       wfDebug("HTML file cache skipped. Either \$wgShowIPinHeader and/or \$wgDebugToolbar on\n" );
+                       return false;
+               }
+
                // Get all query values
                $queryVals = $context->getRequest()->getValues();
                foreach ( $queryVals as $query => $val ) {

diff --git a/maintenance/rebuildFileCache.php b/maintenance/rebuildFileCache.php
index b725f03..441310d 100644 (file)
--- a/maintenance/rebuildFileCache.php
+++ b/maintenance/rebuildFileCache.php
@@ -34,10 +34,14 @@ class RebuildFileCache extends Maintenance {
 
        public function execute() {
                global $wgUseFileCache, $wgReadOnly, $wgContentNamespaces, $wgRequestTime;
+               global $wgDebugToolbar;
                global $wgTitle, $wgOut;
                if ( !$wgUseFileCache ) {
                        $this->error( "Nothing to do -- \$wgUseFileCache is disabled.", true );
                }
+               // Debug toolbar makes content uncacheable
+               $wgDebugToolbar = false;
+
                $wgReadOnly = 'Building cache'; // avoid DB writes (like enotif/counters)
 
                $start = $this->getOption( 'start', "0" );