diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-12-01 11:32:57 -0800 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-12-01 11:32:57 -0800 |
| commit | 42906a50f39784d2e984ff1dc6f55dfcfd5ab4b6 (patch) | |
| tree | f15dd49c04fae860b6b9fa32fb7ef90357a6479c | |
| parent | 935689ddeeba9a8ef24c19f6fda6ee9af442be6f (diff) | |
| parent | 8c58242fcc4654752ab53c46ec31d1bc4a622140 (diff) | |
| download | rpg-42906a50f39784d2e984ff1dc6f55dfcfd5ab4b6.tar.gz rpg-42906a50f39784d2e984ff1dc6f55dfcfd5ab4b6.tar.bz2 | |
Merge pull request #451 from splitbrain/fs2888
fix numeric expression read in plugin default conf FS#2888
| -rw-r--r-- | lib/plugins/config/settings/config.class.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php index a5a11cda1..05f8470f7 100644 --- a/lib/plugins/config/settings/config.class.php +++ b/lib/plugins/config/settings/config.class.php @@ -330,8 +330,7 @@ if (!class_exists('configuration')) { foreach ($this->get_plugin_list() as $plugin) { $plugin_dir = plugin_directory($plugin); if (@file_exists(DOKU_PLUGIN.$plugin_dir.$file)){ - $conf = array(); - @include(DOKU_PLUGIN.$plugin_dir.$file); + $conf = $this->_read_config(DOKU_PLUGIN.$plugin_dir.$file); foreach ($conf as $key => $value){ $default['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.$key] = $value; } @@ -340,8 +339,7 @@ if (!class_exists('configuration')) { // the same for the active template if (@file_exists(tpl_incdir().$file)){ - $conf = array(); - @include(tpl_incdir().$file); + $conf = $this->_read_config(tpl_incdir().$file); foreach ($conf as $key => $value){ $default['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value; } |