smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-05 19:04:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix compiled filepath of config file did not observe different config_dir (forum topic 24493)

Browse Source
This commit is contained in:
Uwe.Tews@googlemail.com
2013-08-14 19:38:03 +00:00
parent e9601e1d6d
commit e206ba63f0
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,4 +1,7 @@
===== trunk ===== ===== trunk =====
14.08.2013
- bugfix compiled filepath of config file did not observe different config_dir (forum topic 24493)
13.08.2013 13.08.2013
- bugfix the internal resource cache did not observe config_dir changes (forum topic 24493) - bugfix the internal resource cache did not observe config_dir changes (forum topic 24493)

2
libs/sysplugins/smarty_internal_config.php
View File

@@ -104,7 +104,7 @@ class Smarty_Internal_Config
$_compile_id = isset($this->smarty->compile_id) ? preg_replace('![^\w\|]+!', '_', $this->smarty->compile_id) : null; $_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 $_flag = (int) $this->smarty->config_read_hidden + (int) $this->smarty->config_booleanize * 2
+ (int) $this->smarty->config_overwrite * 4; + (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 use_sub_dirs, break file into directories
if ($this->smarty->use_sub_dirs) { if ($this->smarty->use_sub_dirs) {
$_filepath = substr($_filepath, 0, 2) . DS $_filepath = substr($_filepath, 0, 2) . DS