From bc9d46afa580ee1191b02e2fe3b03fd863045b8b Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Wed, 1 Feb 2012 20:24:11 +0100
Subject: [PATCH] some more DOKU_TPL removal
---
lib/plugins/config/admin.php | 6 +++---
lib/plugins/config/settings/config.class.php | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index 64906171d..c883e7b6a 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -270,10 +270,10 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
// the same for the active template
$tpl = $conf['template'];
- if (@file_exists(DOKU_TPLINC.$enlangfile)){
+ if (@file_exists(tpl_incdir().$enlangfile)){
$lang = array();
- @include(DOKU_TPLINC.$enlangfile);
- if ($conf['lang'] != 'en') @include(DOKU_TPLINC.$langfile);
+ @include(tpl_incdir().$enlangfile);
+ if ($conf['lang'] != 'en') @include(tpl_incdir().$langfile);
foreach ($lang as $key => $value){
$this->lang['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value;
}
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index adf7d217a..1cdab607f 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -279,10 +279,10 @@ if (!class_exists('configuration')) {
}
// the same for the active template
- if (@file_exists(DOKU_TPLINC.$file)){
+ if (@file_exists(tpl_incdir().$file)){
$meta = array();
- @include(DOKU_TPLINC.$file);
- @include(DOKU_TPLINC.$class);
+ @include(tpl_incdir().$file);
+ @include(tpl_incdir().$class);
if (!empty($meta)) {
$metadata['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'] = array('fieldset');
}
@@ -314,9 +314,9 @@ if (!class_exists('configuration')) {
}
// the same for the active template
- if (@file_exists(DOKU_TPLINC.$file)){
+ if (@file_exists(tpl_incdir().$file)){
$conf = array();
- @include(DOKU_TPLINC.$file);
+ @include(tpl_incdir().$file);
foreach ($conf as $key => $value){
$default['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value;
}
--
GitLab