From ad849a2b46ae9daf4457f95c6cc714caa211eb64 Mon Sep 17 00:00:00 2001 From: Krinkle Date: Thu, 7 Aug 2014 15:03:29 +0000 Subject: [PATCH] Revert "Stop always loading MonoBook and Vector" This reverts commit aef99727f6bcf655e467dd5a92972c14bda01811. Change-Id: Ic2b1c8336fb4378db2a5012ad60f04869b20cb09 --- includes/Setup.php | 8 ++++++++ tests/phpunit/includes/OutputPageTest.php | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/includes/Setup.php b/includes/Setup.php index 935fa152c6..1eb04c330b 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"; } diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php index e866386244..2cfdfcd6ef 100644 --- a/tests/phpunit/includes/OutputPageTest.php +++ b/tests/phpunit/includes/OutputPageTest.php @@ -141,14 +141,14 @@ class OutputPageTest extends MediaWikiTestCase { // Load module script only array( array( 'test.foo', ResourceLoaderModule::TYPE_SCRIPTS ), - ' + ' ' ), // Load module styles only // This also tests the order the modules are put into the url array( array( array( 'test.baz', 'test.foo', 'test.bar' ), ResourceLoaderModule::TYPE_STYLES ), - ' + ' ' ), // Load private module (combined) @@ -163,13 +163,13 @@ mw.loader.implement("test.quux",function($,jQuery){mw.test.baz({token:123});},{" // Load module script with with ESI array( array( 'test.foo', ResourceLoaderModule::TYPE_SCRIPTS, true ), - ' + ' ' ), // Load module styles with with ESI array( array( 'test.foo', ResourceLoaderModule::TYPE_STYLES, true ), - ' + ' ', ), ); -- 2.20.1