resourceloader: Disable ChronologyProtector on load.php (again)
authorTimo Tijhof <krinklemail@gmail.com>
Fri, 20 Apr 2018 00:15:29 +0000 (01:15 +0100)
committerTimo Tijhof <krinklemail@gmail.com>
Fri, 20 Apr 2018 00:15:29 +0000 (01:15 +0100)
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

load.php

index 974771f..1997fe7 100644 (file)
--- 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(