X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2FSetup.php;h=f6631eadb91fb4361d1d344c238819dc297ca0f4;hp=7cda14cd35b314dc90f3b4d301df8ecd5ae89ede;hb=e758226c91935a1df2b6fd3ed1f18922d8bfb45b;hpb=75d8b6c6cd2b70d98242e1246678c12e973a5dfa

diff --git a/includes/Setup.php b/includes/Setup.php
index 7cda14cd35..f6631eadb9 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -36,8 +36,10 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 $fname = 'Setup.php';
 $ps_setup = Profiler::instance()->scopedProfileIn( $fname );
 
-// If any extensions are still queued, force load them
+// Load queued extensions
 ExtensionRegistry::getInstance()->loadFromQueue();
+// Don't let any other extensions load
+ExtensionRegistry::getInstance()->finish();
 
 // Check to see if we are at the file scope
 if ( !isset( $wgVersion ) ) {
@@ -462,7 +464,7 @@ if ( $wgMaximalPasswordLength !== false ) {
 }
 
 // Backwards compatibility warning
-if ( !$wgSessionsInObjectCache && !$wgSessionsInMemcached ) {
+if ( !$wgSessionsInObjectCache ) {
 	wfDeprecated( '$wgSessionsInObjectCache = false', '1.27' );
 	if ( $wgSessionHandler ) {
 		wfDeprecated( '$wgSessionsHandler', '1.27' );
@@ -818,7 +820,9 @@ $wgOut = RequestContext::getMain()->getOutput(); // BackCompat
 /**
  * @var Parser $wgParser
  */
-$wgParser = new StubObject( 'wgParser', $wgParserConf['class'], [ $wgParserConf ] );
+$wgParser = new StubObject( 'wgParser', function () {
+	return MediaWikiServices::getInstance()->getParser();
+} );
 
 /**
  * @var Title $wgTitle