Merge "filecache: Use current action instead of "view" only in outage mode"

[lhc/web/wiklou.git] / includes / MediaWiki.php

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index b18414d..19e827d 100644 (file)
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -539,7 +539,7 @@ class MediaWiki {
                                HTMLFileCache::useFileCache( $this->context, HTMLFileCache::MODE_OUTAGE )
                        ) {
                                // Try to use any (even stale) file during outages...
-                               $cache = new HTMLFileCache( $context->getTitle(), 'view' );
+                               $cache = new HTMLFileCache( $context->getTitle(), $action );
                                if ( $cache->isCached() ) {
                                        $cache->loadFromFileCache( $context, HTMLFileCache::MODE_OUTAGE );
                                        print MWExceptionRenderer::getHTML( $e );
@@ -898,12 +898,11 @@ class MediaWiki {
                        __METHOD__
                );
 
+               // Important: this must be the last deferred update added (T100085, T154425)
+               DeferredUpdates::addCallableUpdate( [ JobQueueGroup::class, 'pushLazyJobs' ] );
+
                // Do any deferred jobs
                DeferredUpdates::doUpdates( 'enqueue' );
-               DeferredUpdates::setImmediateMode( true );
-
-               // Make sure any lazy jobs are pushed
-               JobQueueGroup::pushLazyJobs();
 
                // Now that everything specific to this request is done,
                // try to occasionally run jobs (if enabled) from the queues