From e206ba63f0fe3513e985ef892e6ab2d500389dac Mon Sep 17 00:00:00 2001 From: "Uwe.Tews@googlemail.com" Date: Wed, 14 Aug 2013 19:38:03 +0000 Subject: [PATCH] - bugfix compiled filepath of config file did not observe different config_dir (forum topic 24493) --- change_log.txt | 3 +++ libs/sysplugins/smarty_internal_config.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/change_log.txt b/change_log.txt index f3900134..3384d282 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,7 @@ ===== trunk ===== +14.08.2013 +- bugfix compiled filepath of config file did not observe different config_dir (forum topic 24493) + 13.08.2013 - bugfix the internal resource cache did not observe config_dir changes (forum topic 24493) diff --git a/libs/sysplugins/smarty_internal_config.php b/libs/sysplugins/smarty_internal_config.php index f376010b..b310c3a6 100644 --- a/libs/sysplugins/smarty_internal_config.php +++ b/libs/sysplugins/smarty_internal_config.php @@ -104,7 +104,7 @@ class Smarty_Internal_Config $_compile_id = isset($this->smarty->compile_id) ? preg_replace('![^\w\|]+!', '_', $this->smarty->compile_id) : null; $_flag = (int) $this->smarty->config_read_hidden + (int) $this->smarty->config_booleanize * 2 + (int) $this->smarty->config_overwrite * 4; - $_filepath = sha1($this->source->name . $_flag); + $_filepath = sha1($this->source->filepath . $_flag); // if use_sub_dirs, break file into directories if ($this->smarty->use_sub_dirs) { $_filepath = substr($_filepath, 0, 2) . DS