summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <gohr@cosmocode.de>2013-11-26 12:47:40 +0100
committerAndreas Gohr <gohr@cosmocode.de>2013-11-26 12:47:40 +0100
commit8c58242fcc4654752ab53c46ec31d1bc4a622140 (patch)
tree71cc396287edb65775d96b6b92d880aebca02085
parent43e700149db19863b559e0eebc44132c611ef08d (diff)
downloadrpg-8c58242fcc4654752ab53c46ec31d1bc4a622140.tar.gz
rpg-8c58242fcc4654752ab53c46ec31d1bc4a622140.tar.bz2
FS#2888 fix for templates
-rw-r--r--lib/plugins/config/settings/config.class.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index ab76ddc9e..05f8470f7 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -339,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;
}