Robert Vogel has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/318944

Change subject: Fixes in default configuration
......................................................................

Fixes in default configuration

Change-Id: I33e016c9f980953d8f29887f31c96c345d95d87e
---
M BlueSpiceSMWConnector.php
M LocalSettings.BlueSpiceSemantics.php
M includes/DefaultSettings.SemanticMediaWiki.php
3 files changed, 12 insertions(+), 14 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceSMWConnector 
refs/changes/44/318944/1

diff --git a/BlueSpiceSMWConnector.php b/BlueSpiceSMWConnector.php
index 472e56c..3787726 100644
--- a/BlueSpiceSMWConnector.php
+++ b/BlueSpiceSMWConnector.php
@@ -26,7 +26,6 @@
 $GLOBALS['wgHooks']['sfFormPrinterSetup'][] = 
'BSSMWConnectorHooks::onSfFormPrinterSetup';
 $GLOBALS['wgHooks']['BSBookshelfNodeTag'][] = 
'BSSMWConnectorHooks::onBSBookshelfNodeTag';
 $GLOBALS['wgHooks']['BSBookshelfExportTag'][] = 
'BSSMWConnectorHooks::onBSBookshelfExportTag';
-$GLOBALS['wgHooks']['ParserFirstCallInit'][] = 
'BSSMWConnectorHooks::onParserFirstCallInit';
 $GLOBALS['wgHooks']['BSUEModulePDFbeforeGetPage'][] = 
'BSSMWConnectorHooks::onBSUEModulePDFbeforeGetPage';
 $GLOBALS['wgHooks']['BSUEModulePDFgetPage'][] = 
'BSSMWConnectorHooks::onBSUEModulePDFgetPage';
 
diff --git a/LocalSettings.BlueSpiceSemantics.php 
b/LocalSettings.BlueSpiceSemantics.php
index 1986b4b..3326e53 100644
--- a/LocalSettings.BlueSpiceSemantics.php
+++ b/LocalSettings.BlueSpiceSemantics.php
@@ -1,31 +1,31 @@
 <?php
 
-$GLOBALS['smwgNamespaceIndex'] = 700;
+if( !isset( $GLOBALS['smwgNamespaceIndex'] ) ) {
+       $GLOBALS['smwgNamespaceIndex'] = 700;
+}
 
 require_once "$IP/extensions/SemanticMediaWiki/SemanticMediaWiki.php";
 enableSemantics( 'localhost' );
 
-array_push( $GLOBALS['smwgPageSpecialProperties'], array(
-       '_CDAT', '_LEDT', '_NEWP', '_MIME', '_MEDIA'
-) );
-$GLOBALS['smwgEnabledEditPageHelp'] = false;
-
-$GLOBALS['sespSpecialProperties'] = array(
-       '_EUSER', '_CUSER', '_REVID', '_PAGEID', '_VIEWS', '_NREV', '_TNREV',
-       '_SUBP', '_USERREG', '_USEREDITCNT', '_EXIFDATA'
-);
-$GLOBALS['sespUseAsFixedTables'] = true;
-$GLOBALS['wgSESPExcludeBots'] = true;
+require_once( 
"$IP/extensions/BlueSpiceSMWConnector/includes/DefaultSettings.SemanticMediaWiki.php"
 );
 
 require_once "$IP/extensions/SemanticResultFormats/vendor/autoload.php"; 
//Workaround for not being installed via composer
 require_once "$IP/extensions/SemanticResultFormats/SemanticResultFormats.php";
+
 require_once 
"$IP/extensions/SemanticExtraSpecialProperties/vendor/autoload.php"; 
//Workaround for not being installed via composer
 require_once 
"$IP/extensions/SemanticExtraSpecialProperties/SemanticExtraSpecialProperties.php";
+require_once( 
"$IP/extensions/BlueSpiceSMWConnector/includes/DefaultSettings.SemanticExtraSpecialProperties.php"
 );
+
 require_once "$IP/extensions/SemanticForms/SemanticForms.php";
+
 require_once "$IP/extensions/SemanticFormsInputs/SemanticFormsInputs.php";
+
 require_once 
"$IP/extensions/SemanticInternalObjects/SemanticInternalObjects.php";
+
 require_once 
"$IP/extensions/SemanticCompoundQueries/SemanticCompoundQueries.php";
+
 require_once "$IP/extensions/ExternalData/ExternalData.php";
+
 require_once "$IP/extensions/PageSchemas/PageSchemas.php";
 
 require_once( "$IP/extensions/BlueSpiceSMWConnector/BlueSpiceSMWConnector.php" 
);
diff --git a/includes/DefaultSettings.SemanticMediaWiki.php 
b/includes/DefaultSettings.SemanticMediaWiki.php
index 63284b9..645e142 100644
--- a/includes/DefaultSettings.SemanticMediaWiki.php
+++ b/includes/DefaultSettings.SemanticMediaWiki.php
@@ -1,6 +1,5 @@
 <?php
 
-$GLOBALS['smwgNamespaceIndex'] = 700;
 $GLOBALS['smwgPageSpecialProperties'] += array(
        '_CDAT', '_LEDT', '_NEWP', '_MIME', '_MEDIA'
 );

-- 
To view, visit https://gerrit.wikimedia.org/r/318944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I33e016c9f980953d8f29887f31c96c345d95d87e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceSMWConnector
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to