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

- observe compile_id also for config files

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

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

5
libs/sysplugins/smarty_internal_config.php
View File

@@ -135,6 +135,7 @@ class Smarty_Internal_Config {
} }
public function buildCompiledFilepath() 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 + $_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->config_resource_name . $_flag); $_filepath = sha1($this->config_resource_name . $_flag);
@@ -145,6 +146,10 @@ class Smarty_Internal_Config {
. substr($_filepath, 4, 2) . DS . substr($_filepath, 4, 2) . DS
. $_filepath; . $_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; $_compile_dir = $this->smarty->compile_dir;
if (substr($_compile_dir, -1) != DS) { if (substr($_compile_dir, -1) != DS) {
$_compile_dir .= DS; $_compile_dir .= DS;