From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 30 Jun 2017 07:49:47 +0000 (+0000)
Subject: Merge "filecache: Use current action instead of "view" only in outage mode"
X-Git-Tag: 1.31.0-rc.0~2831
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=509c8d6e378a8decae43dcb27276ddae40dc1143;hp=e43c87efd8b7316cd75822e27746148de789817a

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

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 364ed86edf..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 );