jenkins-bot has submitted this change and it was merged. Change subject: Remove MediaWiki settings from callback ......................................................................
Remove MediaWiki settings from callback otherwise "LocalSettings.php" option will be always overriden. ATTENTION: THIS CHANGE MIGHT BREAK INSTALLATIONS! As the "$wgDefaultSkin" variable is not set by the skin itself, it now needs to be set explicitly in "LocalSettings.php" To ease future setups a "LocalSettings.BlueSpiceFree.php" with all default MediaWiki configurations is provided under: https://github.com/hallowelt/bluespice-tools/blob/master/default-configs/LocalSettings.BlueSpiceFree.php Change-Id: Ib28bb615fa7d32275a8a10bb803d0978368fc95e --- M includes/BlueSpiceSkinHooks.php M skin.json 2 files changed, 0 insertions(+), 21 deletions(-) Approvals: Mglaser: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/BlueSpiceSkinHooks.php b/includes/BlueSpiceSkinHooks.php index 053fd46..5c43323 100644 --- a/includes/BlueSpiceSkinHooks.php +++ b/includes/BlueSpiceSkinHooks.php @@ -13,26 +13,6 @@ } /** - * extension.json callback - */ - public static function onRegistration() { - $GLOBALS['wgValidSkinNames']['bluespiceskin'] = 'BlueSpiceSkin'; - - $GLOBALS['wgDefaultSkin'] = 'bluespiceskin'; - $GLOBALS['wgSkipSkins'] = array( - 'chick', - 'cologneblue', - 'common', - 'modern', - 'monobook', - 'myskin', - 'nostalgia', - 'simple', - 'standard' - ); - } - - /** * * @param StateBar $oStatebar * @param array $aTopViews diff --git a/skin.json b/skin.json index 00253e6..a6d0662 100644 --- a/skin.json +++ b/skin.json @@ -30,7 +30,6 @@ "ExtensionFunctions": [ "BlueSpiceSkinHooks::setup" ], - "callback": "BlueSpiceSkinHooks::onRegistration", "ValidSkinNames": { "bluespiceskin": "BlueSpiceSkin" }, -- To view, visit https://gerrit.wikimedia.org/r/321867 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib28bb615fa7d32275a8a10bb803d0978368fc95e Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/skins/BlueSpiceSkin Gerrit-Branch: master Gerrit-Owner: Ljonka <[email protected]> Gerrit-Reviewer: Dvogel hallowelt <[email protected]> Gerrit-Reviewer: Mglaser <[email protected]> Gerrit-Reviewer: Pwirth <[email protected]> Gerrit-Reviewer: Robert Vogel <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
