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

- using multiple cwd with relative template dirs could result in identical compiled file names. (issue 194 and topic 25099)

Browse Source
This commit is contained in:
Uwe.Tews@googlemail.com
2014-06-02 19:56:38 +00:00
parent c7071d9d2c
commit 2c5ce49b97
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
change_log.txt
View File

@@ -1,4 +1,7 @@
===== 3.1.19-dev ===== (xx.xx.2014) ===== 3.1.19-dev ===== (xx.xx.2014)
02.06.2014
- using multiple cwd with relative template dirs could result in identical compiled file names. (issue 194 and topic 25099)
19.04.2014 19.04.2014
- bugfix calling createTemplate(template, data) with empty data array caused notice of array to string conversion (Issue 189) - bugfix calling createTemplate(template, data) with empty data array caused notice of array to string conversion (Issue 189)
- bugfix clearCompiledTemplate() did not delete files on WINDOWS when a compile_id was specified - bugfix clearCompiledTemplate() did not delete files on WINDOWS when a compile_id was specified
@@ -6,7 +9,6 @@
18.04.2014 18.04.2014
- revert bugfix of 5.4.2015 because %-e date format is not supported on all operating systems - revert bugfix of 5.4.2015 because %-e date format is not supported on all operating systems
===== 3.1.18 ===== (07.04.2014) ===== 3.1.18 ===== (07.04.2014)
06.04.2014 06.04.2014
- bugfix template inheritance fail when using custom resource after patch of 8.3.2014 (Issue 187) - bugfix template inheritance fail when using custom resource after patch of 8.3.2014 (Issue 187)

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->filepath . $_flag); $_filepath = sha1(realpath($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

2
libs/sysplugins/smarty_internal_resource_extends.php
View File

@@ -50,7 +50,7 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource
} }
$source->components = $sources; $source->components = $sources;
$source->filepath = $s->filepath; $source->filepath = $s->filepath;
$source->uid = sha1($uid); $source->uid = sha1(realpath($uid));
if ($_template && $_template->smarty->compile_check) { if ($_template && $_template->smarty->compile_check) {
$source->timestamp = $s->timestamp; $source->timestamp = $s->timestamp;
$source->exists = $exists; $source->exists = $exists;

2
libs/sysplugins/smarty_internal_resource_file.php
View File

@@ -33,7 +33,7 @@ class Smarty_Internal_Resource_File extends Smarty_Resource
$source->smarty->security_policy->isTrustedResourceDir($source->filepath); $source->smarty->security_policy->isTrustedResourceDir($source->filepath);
} }
$source->uid = sha1($source->filepath); $source->uid = sha1(realpath($source->filepath));
if ($source->smarty->compile_check && !isset($source->timestamp)) { if ($source->smarty->compile_check && !isset($source->timestamp)) {
$source->timestamp = @filemtime($source->filepath); $source->timestamp = @filemtime($source->filepath);
$source->exists = !!$source->timestamp; $source->exists = !!$source->timestamp;