X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22config_fonctions%22%2C%20%22image_process=%24process%22%29%20.%20%22?a=blobdiff_plain;f=load.php;h=6edb7ec95495b2b9bda9d56ec4b552291e255457;hb=39d5e7aa6e91b6726f10b5e69a2140bd93ddc5a3;hp=c832237059948450919f8cd895c75e176ae3defb;hpb=edcba98e35ca1fd95697fdece32bb3941289f263;p=lhc%2Fweb%2Fwiklou.git

diff --git a/load.php b/load.php
index c832237059..6edb7ec954 100644
--- a/load.php
+++ b/load.php
@@ -22,7 +22,7 @@
  * @author Trevor Parscal
  */
 
-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.
@@ -35,17 +35,17 @@ if ( !$wgRequest->checkUrlExtension() ) {
 	return;
 }
 
-// Set up ResourceLoader
-$resourceLoader = new ResourceLoader(
-	ConfigFactory::getDefaultInstance()->makeConfig( 'main' ),
-	LoggerFactory::getInstance( 'resourceloader' )
-);
+// Disable ChronologyProtector so that we don't wait for unrelated MediaWiki
+// writes when getting database connections for ResourceLoader. (T192611)
+MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->disableChronologyProtection();
+
+$resourceLoader = MediaWikiServices::getInstance()->getResourceLoader();
 $context = new ResourceLoaderContext( $resourceLoader, $wgRequest );
 
 // Respond to ResourceLoader request
 $resourceLoader->respond( $context );
 
-Profiler::instance()->setTemplated( true );
+Profiler::instance()->setAllowOutput();
 
 $mediawiki = new MediaWiki();
 $mediawiki->doPostOutputShutdown( 'fast' );