Pwirth has submitted this change and it was merged. Change subject: Removing MediaWiki settings ......................................................................
Removing MediaWiki settings ... to lower impact of installing only BSF. ATTENTION: THIS CHANGE MIGHT BREAK INSTALLATIONS! ATTENTION: THERE ARE CHANGES IN BLUESPICEEXTENSIONS THAT DEPEND ON THIS ONE. PLEASE MERGE BOTH OR NONE! 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: I066915a5ff94fbe0d6f80d59b7c9514ed2dd4237 --- M extension.json M includes/CoreHooks.php M includes/DefaultSettings.php M includes/ExtensionMW.class.php M includes/ExtensionManager.class.php 5 files changed, 10 insertions(+), 41 deletions(-) Approvals: Pwirth: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 4cfc8e0..7f24267 100644 --- a/extension.json +++ b/extension.json @@ -371,6 +371,7 @@ "PageContentSaveComplete": "BsCoreHooks::onPageContentSaveComplete" }, "config": { + "_prefix": "bsg", "BlueSpiceExtInfo": { "name": "BlueSpice", "version": "2.27.0", @@ -381,7 +382,8 @@ "author": [ "[http://www.hallowelt.com Hallo Welt! GmbH]" ] - } + }, + "ConfigFiles": [] }, "AutoloadClasses": { "BsCore": "includes/Core.class.php", @@ -531,7 +533,6 @@ "BSEntityContent": "includes/content/EntityContent.php", "BSEntityContentHandler": "includes/content/EntityContentHandler.php" }, - "bsgConfigFiles": [], "load_composer_autoloader": true, "manifest_version": 1, "callback": "BsCoreHooks::onRegistry" diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php index f082889..f4e805b 100755 --- a/includes/CoreHooks.php +++ b/includes/CoreHooks.php @@ -29,7 +29,6 @@ */ global $bsgConfigFiles; - foreach( $bsgConfigFiles as $sConfigFileKey => $sConfigFilePath ) { if ( file_exists( $sConfigFilePath ) ) { include( $sConfigFilePath ); @@ -59,8 +58,8 @@ * @param Array $aSoftware: The array of software in format 'name' => 'version'. */ public static function onSoftwareInfo( &$aSoftware ) { - global $wgBlueSpiceExtInfo; - $aSoftware['[http://bluespice.com/ ' . $wgBlueSpiceExtInfo['name'] . '] ([' . SpecialPage::getTitleFor( 'SpecialCredits' )->getFullURL() . ' Credits])'] = $wgBlueSpiceExtInfo['version']; + global $bsgBlueSpiceExtInfo; + $aSoftware['[http://bluespice.com/ ' . $bsgBlueSpiceExtInfo['name'] . '] ([' . SpecialPage::getTitleFor( 'SpecialCredits' )->getFullURL() . ' Credits])'] = $bsgBlueSpiceExtInfo['version']; return true; } diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index fbe9f53..ae8e519 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -32,21 +32,6 @@ die( 1 ); } -//Default settings needed for BlueSpice -$wgNamespacesWithSubpages[NS_MAIN] = true; -$wgApiFrameOptions = 'SAMEORIGIN'; -$wgRSSUrlWhitelist = array( - "http://blog.blue-spice.org/feed/";, - "http://blog.bluespice.com/feed/";, - "http://blog.hallowelt.com/feed/";, -); -$wgExternalLinkTarget = '_blank'; -$wgCapitalLinkOverrides[ NS_FILE ] = false; -$wgRestrictDisplayTitle = false; //Otherwise only titles that normalize to the same DB key are allowed -$wgUrlProtocols[] = "file://"; -$wgVerifyMimeType = false; -$wgAllowJavaUploads = true; - /* * If this global is set to an array like * $bsgTestSystem = array( @@ -189,22 +174,6 @@ $bsgSystemNamespaces = array( //1599 => 'NS_COOL_STUFF' ); - -/** - * PHP config files registered here will be included on "SetupAfterCache" - * time. Access to all global config variables need to be in the form of - * $GLOBALS['wg...'] as the inclusion will be done in callback function scope - * rather than in global scope. - */ -$bsgConfigFiles = array( - //'extensionname' => 'path/to/file.php' - - //Pre-registering for BC; Should be removed in future releases - 'GroupManager' => BSCONFIGDIR . DS . 'gm-settings.php', - 'NamespaceManager' => BSCONFIGDIR . DS . 'nm-settings.php', - 'PermissionManager' => BSCONFIGDIR . DS . 'pm-settings.php', -); - $wgResourceLoaderLESSVars = array_merge( $wgResourceLoaderLESSVars, array( 'bs-color-primary' => '#3e5389', //blue diff --git a/includes/ExtensionMW.class.php b/includes/ExtensionMW.class.php index febaeba..f2aae4e 100644 --- a/includes/ExtensionMW.class.php +++ b/includes/ExtensionMW.class.php @@ -79,12 +79,12 @@ public function setup( $sExtName = "", $aConfig = array() ) { wfProfileIn( 'Performance: ' . __METHOD__ ); - global $wgExtensionCredits, $wgBlueSpiceExtInfo; + global $wgExtensionCredits, $bsgBlueSpiceExtInfo; // Extension credits that will show up on Special:Version if( !empty( $aConfig['deprecatedSince'] ) ) { $sVersion = str_replace( 'default', - $wgBlueSpiceExtInfo['version'], + $bsgBlueSpiceExtInfo['version'], $this->mInfo[EXTINFO::VERSION] ); diff --git a/includes/ExtensionManager.class.php b/includes/ExtensionManager.class.php index c8c5720..11dfc83 100644 --- a/includes/ExtensionManager.class.php +++ b/includes/ExtensionManager.class.php @@ -129,7 +129,7 @@ } protected static function makeExtensionConfig( $sExtName = "", $aConfig = array() ) { - global $wgBlueSpiceExtInfo; + global $bsgBlueSpiceExtInfo; if( !isset( $aConfig['className'] ) ) { $aConfig['className'] = $sExtName; } @@ -144,12 +144,12 @@ } $aConfig['status'] = str_replace( 'default', - $wgBlueSpiceExtInfo['status'], + $bsgBlueSpiceExtInfo['status'], $aConfig['status'] ); $aConfig['package'] = str_replace( 'default', - $wgBlueSpiceExtInfo['package'], + $bsgBlueSpiceExtInfo['package'], $aConfig['package'] ); return $aConfig; -- To view, visit https://gerrit.wikimedia.org/r/322653 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I066915a5ff94fbe0d6f80d59b7c9514ed2dd4237 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Robert Vogel <vo...@hallowelt.biz> Gerrit-Reviewer: Dvogel hallowelt <daniel.vo...@hallowelt.com> Gerrit-Reviewer: Ljonka <l.verhovs...@gmail.com> Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz> Gerrit-Reviewer: Pwirth <wi...@hallowelt.biz> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
