Lilu has submitted this change and it was merged.
Change subject: BSWF: BSCONFIGDIR instead of BSROOTDIR
......................................................................
BSWF: BSCONFIGDIR instead of BSROOTDIR
To allow proper settings in each wiki instance of a BlueSpiceWikiFarm we
need to change from BSROOTDIR to BSCONFIGDIR in several extensions.
Change-Id: I5b389fa809eb8f90e56a5c244a84d778e0151214
---
M GroupManager/GroupManager.class.php
M NamespaceManager/NamespaceManager.class.php
M PermissionManager/PermissionManager.class.php
M PermissionManager/PermissionManager.setup.php
4 files changed, 15 insertions(+), 11 deletions(-)
Approvals:
Lilu: Verified; Looks good to me, approved
diff --git a/GroupManager/GroupManager.class.php
b/GroupManager/GroupManager.class.php
index 5334a2b..4922ce6 100644
--- a/GroupManager/GroupManager.class.php
+++ b/GroupManager/GroupManager.class.php
@@ -325,7 +325,8 @@
$sSaveContent .= "\n\$wgGroupPermissions =
array_merge(\$wgGroupPermissions, \$wgAdditionalGroups);";
- $res = file_put_contents(
BSROOTDIR.DS.'config'.DS.'gm-settings.php', $sSaveContent );
+ $sConfigFile = BSCONFIGDIR . DS . 'gm-settings.php';
+ $res = file_put_contents( $sConfigFile, $sSaveContent );
if ( $res ) {
return array(
'success' => true,
@@ -335,7 +336,7 @@
return array(
'success' => false,
// TODO SU (04.07.11 11:44): i18n
- 'message' => 'Not able to create or write file
"'.BSROOTDIR.DS.'config'.DS.'gm-settings.php".'
+ 'message' => 'Not able to create or write file
"' . $sConfigFile . '".'
);
}
}
diff --git a/NamespaceManager/NamespaceManager.class.php
b/NamespaceManager/NamespaceManager.class.php
index f599f90..a73ab1c 100644
--- a/NamespaceManager/NamespaceManager.class.php
+++ b/NamespaceManager/NamespaceManager.class.php
@@ -594,10 +594,11 @@
global $wgExtraNamespaces, $wgNamespacesWithSubpages,
$wgContentNamespaces,
$wgNamespacesToBeSearchedDefault;
- if ( !file_exists( BSROOTDIR . DS . 'config' . DS .
'nm-settings.php' ) ) {
+ $sConfigFile = BSCONFIGDIR . DS . 'nm-settings.php';
+ if ( !file_exists( $sConfigFile ) ) {
return array();
}
- $sConfigContent = file_get_contents( BSROOTDIR . DS . 'config'
. DS . 'nm-settings.php' );
+ $sConfigContent = file_get_contents( $sConfigFile );
$aUserNamespaces = array();
/*if ( preg_match_all(
'%// START Namespace
([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*).*define\("NS_\1", ([0-9]*)\).*?//
END Namespace \1%s',
@@ -677,7 +678,9 @@
$sSaveContent .= "// END Namespace
{$sDefName}\n\n";
}
}
- $res = file_put_contents( BSROOTDIR . DS . 'config' . DS .
'nm-settings.php', $sSaveContent );
+
+ $sConfigFile = BSCONFIGDIR . DS . 'nm-settings.php';
+ $res = file_put_contents( $sConfigFile, $sSaveContent );
if ( $res ) {
return array(
@@ -688,7 +691,7 @@
return array(
'success' => false,
// TODO SU (04.07.11 12:05): i18n
- 'message' => 'Not able to create or write "' .
BSROOTDIR . DS . 'config' . DS . 'nm-settings.php".'
+ 'message' => 'Not able to create or write "' .
$sConfigFile. '".'
);
}
diff --git a/PermissionManager/PermissionManager.class.php
b/PermissionManager/PermissionManager.class.php
index 4466f60..20616c1 100644
--- a/PermissionManager/PermissionManager.class.php
+++ b/PermissionManager/PermissionManager.class.php
@@ -548,7 +548,7 @@
return array(
'success' => false,
// TODO SU (04.07.11 12:06): i18n
- 'msg' => 'Not able to create or write "' .
BSROOTDIR . DS . 'config' . DS . 'pm-settings.php".'
+ 'msg' => 'Not able to create or write "' .
$bsgPermissionManagerGroupSettingsFile . '".'
);
}
}
@@ -561,12 +561,12 @@
protected static function backupExistingSettings() {
global $bsgPermissionManagerGroupSettingsFile;
- if(file_exists($bsgPermissionManagerGroupSettingsFile)) {
+ if( file_exists( $bsgPermissionManagerGroupSettingsFile ) ) {
$timestamp = wfTimestampNow();
$backupFilename = "pm-settings-backup-{$timestamp}.php";
- $backupFile =
dirname($bsgPermissionManagerGroupSettingsFile)."/{$backupFilename}";
+ $backupFile = dirname(
$bsgPermissionManagerGroupSettingsFile )."/{$backupFilename}";
- file_put_contents($backupFile,
file_get_contents($bsgPermissionManagerGroupSettingsFile));
+ file_put_contents( $backupFile, file_get_contents(
$bsgPermissionManagerGroupSettingsFile ) );
}
}
}
diff --git a/PermissionManager/PermissionManager.setup.php
b/PermissionManager/PermissionManager.setup.php
index 25ba256..a63d2be 100644
--- a/PermissionManager/PermissionManager.setup.php
+++ b/PermissionManager/PermissionManager.setup.php
@@ -63,7 +63,7 @@
}
if( !isset( $bsgPermissionManagerGroupSettingsFile ) ) {
- $bsgPermissionManagerGroupSettingsFile = BSROOTDIR . DS . 'config' . DS
. 'pm-settings.php';
+ $bsgPermissionManagerGroupSettingsFile = BSCONFIGDIR . DS .
'pm-settings.php';
}
$bsgPermissionManagerDefaultTemplates = array(
--
To view, visit https://gerrit.wikimedia.org/r/191548
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5b389fa809eb8f90e56a5c244a84d778e0151214
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel <[email protected]>
Gerrit-Reviewer: Lilu <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pigpen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
