From aef99727f6bcf655e467dd5a92972c14bda01811 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Tue, 22 Jul 2014 23:32:53 +0200 Subject: [PATCH] Stop always loading MonoBook and Vector Removing the hack added in Ib4bdda5e. This will cause an error message to be shown to almost every MediaWiki user who upgrades their installation (including us developers) until they add entries for their skins to LocalSettings. This is deemed an acceptable trade-off, and the message makes it easy to resolve the issue. Bug: 68402 Change-Id: I2596ef73088ce94d78ce3dc3ae4da9d81023a2cb --- includes/Setup.php | 8 -------- tests/phpunit/includes/OutputPageTest.php | 8 ++++---- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/includes/Setup.php b/includes/Setup.php index 1eb04c330b..935fa152c6 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -78,14 +78,6 @@ 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 2cfdfcd6ef..e866386244 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