X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=load.php;h=1997fe73fcdd0852d0cbc2ccc71c162b322b136b;hb=cc69954a9df31b3c31d72074ec84c0a0d9464e29;hp=1d6a242575af3462c65b640b6a159360e07b9437;hpb=6505e5f278aae664f78fb8f876c10902d2195231;p=lhc%2Fweb%2Fwiklou.git

diff --git a/load.php b/load.php
index 1d6a242575..1997fe73fc 100644
--- a/load.php
+++ b/load.php
@@ -23,6 +23,11 @@
  */
 
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\MediaWikiServices;
+
+// This endpoint is supposed to be independent of request cookies and other
+// details of the session. Enforce this constraint with respect to session use.
+define( 'MW_NO_SESSION', 1 );
 
 require __DIR__ . '/includes/WebStart.php';
 
@@ -31,14 +36,19 @@ if ( !$wgRequest->checkUrlExtension() ) {
 	return;
 }
 
-// Respond to resource loading request.
-// foo()->bar() syntax is not supported in PHP4, and this file needs to *parse* in PHP4.
-$configFactory = ConfigFactory::getDefaultInstance();
+// 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(
-	$configFactory->makeConfig( 'main' ),
+	ConfigFactory::getDefaultInstance()->makeConfig( 'main' ),
 	LoggerFactory::getInstance( 'resourceloader' )
 );
-$resourceLoader->respond( new ResourceLoaderContext( $resourceLoader, $wgRequest ) );
+$context = new ResourceLoaderContext( $resourceLoader, $wgRequest );
+
+// Respond to ResourceLoader request
+$resourceLoader->respond( $context );
 
 Profiler::instance()->setTemplated( true );