X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWebStart.php;h=58c953af4a4ce70c8b933a60e2585189ce7a1d15;hb=66266d776157572731c4d49531cdbb9479b554ec;hp=901b1e8e360cf0f517df191b135887b9a33211eb;hpb=7113a5d0a5592c016f6dd57e1de002b8263c0bc9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/WebStart.php b/includes/WebStart.php
index 901b1e8e36..58c953af4a 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -91,14 +91,6 @@ if ( $IP === false ) {
 	}
 }
 
-# Load composer's autoloader if present
-if ( is_readable( "$IP/vendor/autoload.php" ) ) {
-	require_once "$IP/vendor/autoload.php";
-}
-
-# Get MWInit class
-require_once "$IP/includes/Init.php";
-
 # Start the autoloader, so that extensions can derive classes from core files
 require_once "$IP/includes/AutoLoader.php";
 
@@ -119,9 +111,14 @@ wfProfileIn( 'WebStart.php-conf' );
 # Load default settings
 require_once "$IP/includes/DefaultSettings.php";
 
+# Load composer's autoloader if present
+if ( is_readable( "$IP/vendor/autoload.php" ) ) {
+	require_once "$IP/vendor/autoload.php";
+}
+
 if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
 	# Use a callback function to configure MediaWiki
-	MWFunction::call( MW_CONFIG_CALLBACK );
+	call_user_func( MW_CONFIG_CALLBACK );
 } else {
 	if ( !defined( 'MW_CONFIG_FILE' ) ) {
 		define( 'MW_CONFIG_FILE', "$IP/LocalSettings.php" );