dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Reorder SpecialRecentChanges::webOutput"
[lhc/web/wiklou.git]
/
includes
/
WebStart.php
diff --git
a/includes/WebStart.php
b/includes/WebStart.php
index
901b1e8
..
f840a5e
100644
(file)
--- a/
includes/WebStart.php
+++ b/
includes/WebStart.php
@@
-91,11
+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";
# Get MWInit class
require_once "$IP/includes/Init.php";
@@
-119,9
+114,14
@@
wfProfileIn( 'WebStart.php-conf' );
# Load default settings
require_once "$IP/includes/DefaultSettings.php";
# 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
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" );
} else {
if ( !defined( 'MW_CONFIG_FILE' ) ) {
define( 'MW_CONFIG_FILE', "$IP/LocalSettings.php" );