[evolvis-commits] r14541: Fixed unified config to also find config.ini in /etc/gforge.
mirabilos at evolvis.org
mirabilos at evolvis.org
Mon Feb 28 04:22:04 CET 2011
Author: mirabilos
Date: 2011-02-28 04:22:04 +0100 (Mon, 28 Feb 2011)
New Revision: 14541
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/common/include/config.php
trunk/gforge_base/evolvisforge-5.1/gforge/www/env.inc.php
Log:
Fixed unified config to also find config.ini in /etc/gforge.
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/include/config.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/include/config.php 2011-02-28 03:22:01 UTC (rev 14540)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/include/config.php 2011-02-28 03:22:04 UTC (rev 14541)
@@ -71,13 +71,8 @@
$fusionforge_config = new FusionForgeConfig () ;
}
-function forge_get_config ($var, $section = NULL) {
+function forge_get_config ($var, $section = 'core') {
$c = FusionForgeConfig::get_instance () ;
-
- if ($section == NULL) {
- $section = 'core' ;
- }
-
return $c->get_value ($section, $var) ;
}
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/env.inc.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/env.inc.php 2011-02-28 03:22:01 UTC (rev 14540)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/env.inc.php 2011-02-28 03:22:04 UTC (rev 14541)
@@ -36,6 +36,12 @@
} elseif (file_exists($fusionforge_basedir.'/config/local.inc.php')) {
$gfcgfile = $fusionforge_basedir.'/config/local.inc.php';
$gfconfig = $fusionforge_basedir.'/config/';
+} elseif (file_exists('/etc/gforge/local.inc.php')) {
+ $gfcgfile = '/etc/gforge/local.inc.php';
+ $gfconfig = '/etc/gforge/';
+} elseif (file_exists('/etc/gforge/local.inc')) {
+ $gfcgfile = '/etc/gforge/local.inc';
+ $gfconfig = '/etc/gforge/';
} else {
$gfcgfile = 'local.inc';
$gfconfig = '';
More information about the evolvis-commits
mailing list