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

- bugfix the bufix of 02.06.2014 broke correct handling of child templates with same name but different template folders in extends resource (issue 194 and topic 25099)

Browse Source
This commit is contained in:
Uwe.Tews@googlemail.com
2014-07-03 23:16:23 +00:00
parent 4b3e1eb89d
commit c2bba29216
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
change_log.txt
View File

@@ -1,7 +1,10 @@
===== 3.1.20-dev ===== (xx.xx.2014) ===== 3.1.20-dev ===== (xx.xx.2014)
04.07.2014
- bugfix the bufix of 02.06.2014 broke correct handling of child templates with same name but different template folders in extends resource (issue 194 and topic 25099)
===== 3.1.19 ===== (06.30.2014) ===== 3.1.19 ===== (06.30.2014)
20.06.2014 20.06.2014
- bugfix template variables could not be passed as paramter in {include} when the include was in a {nocache} section (topic 25131) - bugfix template variables could not be passed as parameter in {include} when the include was in a {nocache} section (topic 25131)
17.06.2014 17.06.2014
- bugfix large template text of some charsets could cause parsing errors (topic 24630) - bugfix large template text of some charsets could cause parsing errors (topic 24630)

4
libs/sysplugins/smarty_internal_resource_extends.php
View File

@@ -44,14 +44,14 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource
throw new SmartyException("Resource type {$s->type} cannot be used with the extends resource type"); throw new SmartyException("Resource type {$s->type} cannot be used with the extends resource type");
} }
$sources[$s->uid] = $s; $sources[$s->uid] = $s;
$uid .= $s->filepath; $uid .= realpath($s->filepath);
if ($_template && $_template->smarty->compile_check) { if ($_template && $_template->smarty->compile_check) {
$exists = $exists && $s->exists; $exists = $exists && $s->exists;
} }
} }
$source->components = $sources; $source->components = $sources;
$source->filepath = $s->filepath; $source->filepath = $s->filepath;
$source->uid = sha1(realpath($uid)); $source->uid = sha1($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;