This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via d815f40f129bdfc89d3c38a931e750076c158f09 (commit)
from 41261c904799fa0cc42283f74861d3a5bb9093b7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=d815f40f129bdfc89d3c38a931e750076c158f09
commit d815f40f129bdfc89d3c38a931e750076c158f09
Author: mirabilos <[email protected]>
Date: Wed Jun 1 10:35:22 2016 +0200
make common function for transliterating DB names; part of [#816] fix
diff --git a/src/plugins/mediawiki/www/LocalSettings.php
b/src/plugins/mediawiki/www/LocalSettings.php
index 6b3bdbd..f860855 100644
--- a/src/plugins/mediawiki/www/LocalSettings.php
+++ b/src/plugins/mediawiki/www/LocalSettings.php
@@ -101,6 +101,11 @@ $wgScriptPath =
"/plugins/mediawiki/wiki/$fusionforgeproject" ;
$wgEmergencyContact = forge_get_config('admin_email');
$wgPasswordSender = forge_get_config('admin_email');
+function ff_mw_db_name($s) {
+ $s = str_replace('-', '_', $s);
+ return $s;
+}
+
$wgDBtype = "forge";
$wgDBserver = forge_get_config('database_host') ;
if (forge_get_config('mw_dbtype', 'mediawiki')=='mysql'){
@@ -115,8 +120,8 @@ $wgDBpassword = forge_get_config('database_password')
;
$wgDBadminuser = forge_get_config('database_user') ;
$wgDBadminpassword = forge_get_config('database_password') ;
$wgDBport = forge_get_config('database_port') ;
-$wgDBmwschema = str_replace ('-', '_',
"plugin_mediawiki_$fusionforgeproject") ;
-$wgDBts2schema = str_replace ('-', '_',
"plugin_mediawiki_$fusionforgeproject") ;
+$wgDBmwschema = 'plugin_mediawiki_' . ff_mw_db_name($fusionforgeproject);
+$wgDBts2schema = 'plugin_mediawiki_' . ff_mw_db_name($fusionforgeproject);
$wgMainCacheType = CACHE_NONE;
$wgMemCachedServers = array();
-----------------------------------------------------------------------
Summary of changes:
src/plugins/mediawiki/www/LocalSettings.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
