projects
/
fusionforge
/
fusionforge.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b3d8993
)
Only overwrite defined configuration values when reading a config file
author
Roland Mas
<lolando@debian.org>
Mon, 15 Mar 2010 13:03:09 +0000
(13:03 +0000)
committer
Roland Mas
<lolando@debian.org>
Mon, 15 Mar 2010 13:03:09 +0000
(13:03 +0000)
gforge/common/include/config.php
patch
|
blob
|
history
diff --git
a/gforge/common/include/config.php
b/gforge/common/include/config.php
index d928a2adbfa84dc398aa8f0b8a0aee173005e8e3..f1f0104b7650a9df7b9319aecb9f25e6e4b490fa 100644
(file)
--- a/
gforge/common/include/config.php
+++ b/
gforge/common/include/config.php
@@
-54,9
+54,13
@@
function fusionforge_read_config_file ($file) {
$sections = parse_ini_file ($file, true) ;
foreach ($sections as $sectname => $options) {
- foreach ($options as $key => $value) {
+ if (!isset ($fusionforge_config[$section]))
+ continue ;
+ foreach ($options as $key => $value) {
+ if (!isset ($fusionforge_config[$section][$var]))
+ continue ;
$fusionforge_config[$sectname][$key] = $value ;
- }
+ }
}
return ;