X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2FMediaWiki.php;h=19e827dd032fbaca33d038c78e9b6a0dc08a16bf;hb=509c8d6e378a8decae43dcb27276ddae40dc1143;hp=b18414d7ee696c3e841e5fcb3a13cacf068ceba5;hpb=bfb9b1ce8646180709c23d925ad2262514106289;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index b18414d7ee..19e827dd03 100644
--- 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