Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/71616
Change subject: Move inclusion of composer autoloader to after inclusion of
DefaultSettings
......................................................................
Move inclusion of composer autoloader to after inclusion of DefaultSettings
Before this change, installing an extension via Composer would fail since
DefaultSettings would overide things set by such an extension. Now inclusion
of the autoloader is happening right after inclusion of LocalSettings, thus
extensions will end up getting included at pretty much the same point as
when putting them at the end of LocalSettings.
Change-Id: Ia8ad38b4444d4175bff1b08695b4dfeb77aa3f52
---
M includes/WebStart.php
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/16/71616/1
diff --git a/includes/WebStart.php b/includes/WebStart.php
index 901b1e8..47164c4 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -91,11 +91,6 @@
}
}
-# 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";
@@ -139,6 +134,11 @@
require_once MW_CONFIG_FILE;
}
+# Load composer's autoloader if present
+if ( is_readable( "$IP/vendor/autoload.php" ) ) {
+ require_once "$IP/vendor/autoload.php";
+}
+
wfProfileOut( 'WebStart.php-conf' );
wfProfileIn( 'WebStart.php-ob_start' );
--
To view, visit https://gerrit.wikimedia.org/r/71616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia8ad38b4444d4175bff1b08695b4dfeb77aa3f52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
