From f7939a856be54c84b803308ae03f2880fd19c0d1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Tue, 1 Jul 2014 15:39:46 +0200 Subject: [PATCH] Setup.php: Move hacky skin requires higher up Some of the setup code in some of the configurations apparently depends on all extensions and skins being already required by the point Setup.php is being loaded. We ran into issues with LocalisationCache. Bug: 67318 Change-Id: Idde13c2e835a9969593a4716a62b392d4c1388d6 --- includes/Setup.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/includes/Setup.php b/includes/Setup.php index 783ef3fb82..eaa86ecc87 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -78,6 +78,14 @@ if ( $wgExtensionAssetsPath === false ) { $wgExtensionAssetsPath = "$wgScriptPath/extensions"; } +// Enable default skins. Temporary, to be removed before 1.24 release. +// This is hacky and bad, the require_once calls should eventually be generated by the installer +// and placed in LocalSettings.php. +// While this is in Setup.php, it needs to be done as soon as possible, as some of the setup code +// depends on all extensions and skins being already required (bug 67318). +require_once "$wgStyleDirectory/MonoBook/MonoBook.php"; +require_once "$wgStyleDirectory/Vector/Vector.php"; + if ( $wgLogo === false ) { $wgLogo = "$wgStylePath/common/images/wiki.png"; } @@ -606,12 +614,6 @@ $wgTitle = null; $wgDeferredUpdateList = array(); -// Enable default skins. -// This is hacky and bad, the require_once calls should eventually be generated by the installer -// and placed in LocalSettings.php. -require_once "$wgStyleDirectory/MonoBook/MonoBook.php"; -require_once "$wgStyleDirectory/Vector/Vector.php"; - wfProfileOut( $fname . '-globals' ); wfProfileIn( $fname . '-extensions' ); -- 2.20.1