- observe compile_id also for config files

This commit is contained in:
uwe.tews@googlemail.com
2010-11-10 16:46:57 +00:00
parent 87ec00f518
commit 8497415888
2 changed files with 8 additions and 0 deletions

View File

@@ -1,3 +1,6 @@
10/11/2010
- observe compile_id also for config files
09/11/2010
-bugfix on complex expressions as start value for {for} tag

View File

@@ -135,6 +135,7 @@ class Smarty_Internal_Config {
}
public function buildCompiledFilepath()
{
$_compile_id = isset($_template->smarty->compile_id) ? preg_replace('![^\w\|]+!', '_', $_template->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->config_resource_name . $_flag);
@@ -145,6 +146,10 @@ class Smarty_Internal_Config {
. substr($_filepath, 4, 2) . DS
. $_filepath;
}
$_compile_dir_sep = $_template->smarty->use_sub_dirs ? DS : '^';
if (isset($_compile_id)) {
$_filepath = $_compile_id . $_compile_dir_sep . $_filepath;
}
$_compile_dir = $this->smarty->compile_dir;
if (substr($_compile_dir, -1) != DS) {
$_compile_dir .= DS;