Robert Vogel has uploaded a new change for review. https://gerrit.wikimedia.org/r/322654
Change subject: BSGroupManager: Added bsgConfigFiles... ...................................................................... BSGroupManager: Added bsgConfigFiles... ... also changed global var name. This got necessary by change https://gerrit.wikimedia.org/r/322653 Change-Id: Ieef08312fd754009f61ac746367a7f054f80c2c7 ATTENTION: MERGE ONLY IF CHANGE IN BSF ALSO GETS MERGED! --- M ExtensionInfo/includes/ViewExtensionInfoTable.php M GroupManager/GroupManager.class.php M GroupManager/extension.json M UniversalExport/UniversalExport.class.php 4 files changed, 16 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/54/322654/1 diff --git a/ExtensionInfo/includes/ViewExtensionInfoTable.php b/ExtensionInfo/includes/ViewExtensionInfoTable.php index 53323ae..1e86359 100644 --- a/ExtensionInfo/includes/ViewExtensionInfoTable.php +++ b/ExtensionInfo/includes/ViewExtensionInfoTable.php @@ -48,7 +48,7 @@ * @return string The rendered HTML of the extension list */ public function execute( $params = false ) { - global $wgBlueSpiceExtInfo, $wgVersion; + global $bsgBlueSpiceExtInfo, $wgVersion; $aExtensionInfo = array(); foreach ( $this->mExtensions as $sExtName => $aExtension ) { @@ -72,7 +72,7 @@ RequestContext::getMain()->getOutput()->addJsConfigVars( 'aExtensionInfo', $aExtensionInfo ); $sCreditsLink = ' (<a href="' . SpecialPage::getTitleFor( 'SpecialCredits' )->getFullURL() . '">Credits</a>)'; - $sVersion = $wgBlueSpiceExtInfo['version'].( ( $wgBlueSpiceExtInfo['status'] !== 'stable' ) ? ' '.$wgBlueSpiceExtInfo['status'] : '' ); + $sVersion = $bsgBlueSpiceExtInfo['version'].( ( $bsgBlueSpiceExtInfo['status'] !== 'stable' ) ? ' '.$bsgBlueSpiceExtInfo['status'] : '' ); $aOut = array(); $aOut[] = '<table class="bs-softwaretable">'; @@ -81,7 +81,7 @@ $aOut[] = '<th>'.wfMessage( 'bs-extensioninfo-version' )->plain().'</th>'; $aOut[] = '</tr>'; $aOut[] = '<tr>'; - $aOut[] = '<td><a title="'.$wgBlueSpiceExtInfo['url'].'" href="'.$wgBlueSpiceExtInfo['url'].'">'.$wgBlueSpiceExtInfo['name'].'</a>'.$sCreditsLink.'</td>'; + $aOut[] = '<td><a title="'.$bsgBlueSpiceExtInfo['url'].'" href="'.$bsgBlueSpiceExtInfo['url'].'">'.$bsgBlueSpiceExtInfo['name'].'</a>'.$sCreditsLink.'</td>'; $aOut[] = '<td>'.$sVersion.'</td>'; $aOut[] = '</tr>'; $aOut[] = '<tr>'; diff --git a/GroupManager/GroupManager.class.php b/GroupManager/GroupManager.class.php index 348af74..1870a1e 100644 --- a/GroupManager/GroupManager.class.php +++ b/GroupManager/GroupManager.class.php @@ -60,6 +60,16 @@ } /** + * extension.json callback + * @global array $bsgConfigFiles + */ + public static function onRegistration() { + global $bsgConfigFiles; + $bsgConfigFiles['GroupManager'] + = BSCONFIGDIR . DS . 'gm-settings.php'; + } + + /** * saves all groupspecific data to a config file * @return array the json answer */ diff --git a/GroupManager/extension.json b/GroupManager/extension.json index 2c7f8b2..0033692 100644 --- a/GroupManager/extension.json +++ b/GroupManager/extension.json @@ -13,6 +13,7 @@ }, "descriptionmsg": "bs-groupmanager-desc", "type": "bluespice", + "callback": "GroupManager::onRegistration", "bsgExtensions": { "GroupManager": { "className": "GroupManager", diff --git a/UniversalExport/UniversalExport.class.php b/UniversalExport/UniversalExport.class.php index 03c298c..495282b 100644 --- a/UniversalExport/UniversalExport.class.php +++ b/UniversalExport/UniversalExport.class.php @@ -70,13 +70,13 @@ $this->setHook( 'BeforePageDisplay' ); $this->setHook( 'BSUsageTrackerRegisterCollectors' ); - global $wgBlueSpiceExtInfo; + global $bsgBlueSpiceExtInfo; //Configuration variables $aMetadataDefaults = array( 'creator' => 'Hallo Welt! GmbH', ); $aMetadataOverrides = array( - 'producer' => 'UniversalExport '.$wgBlueSpiceExtInfo['version'].' (BlueSpice for MediaWiki)' + 'producer' => 'UniversalExport '.$bsgBlueSpiceExtInfo['version'].' (BlueSpice for MediaWiki)' ); BsConfig::registerVar( 'MW::UniversalExport::CategoryWhitelist', $this->aCategoryWhitelist, BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_ARRAY_STRING ); -- To view, visit https://gerrit.wikimedia.org/r/322654 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieef08312fd754009f61ac746367a7f054f80c2c7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Robert Vogel <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
