From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 20 Apr 2018 00:15:29 +0000 (+0100)
Subject: resourceloader: Disable ChronologyProtector on load.php (again)
X-Git-Tag: 1.31.0-rc.0~9
X-Git-Url: https://git.cyclocoop.org/?a=commitdiff_plain;h=18b4aee3df0e52a5cf908cb533dabf7b5982cc78;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Disable ChronologyProtector on load.php (again)

This was already disabled in 2016 with 98c6743413118f by calling
setRequestInfo() to override the default 'ChronologyProtection' value
from Setup.php.

This stopped working since 4ccb228bde9294d96d which made
getDBLoadBalancerFactory (in ServiceWiring) obtains a LoadBalancer
from MWLBFactory::setSchemaAliases, and requestInfo is not
re-evaluated after that.

Bug: T192611
Change-Id: I68748e8f15bcd7bfa8d7921964788e2798682e05
(cherry picked from commit 0612ce28964e35e9ccb988e7372b1f40c00314e8)
---

diff --git a/load.php b/load.php
index 974771f978..1997fe73fc 100644
--- a/load.php
+++ b/load.php
@@ -36,11 +36,9 @@ if ( !$wgRequest->checkUrlExtension() ) {
 	return;
 }
 
-// Don't initialise ChronologyProtector from object cache, and
-// don't wait for unrelated MediaWiki writes when querying ResourceLoader.
-MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->setRequestInfo( [
-	'ChronologyProtection' => 'false',
-] );
+// Disable ChronologyProtector so that we don't wait for unrelated MediaWiki
+// writes when getting database connections for ResourceLoader. (T192611)
+MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->disableChronologyProtection();
 
 // Set up ResourceLoader
 $resourceLoader = new ResourceLoader(