mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

fixes extends resource

Browse Source 
- fixes the bugfix 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)

git-svn-id: http://smarty-php.googlecode.com/svn/trunk/distribution/libs@4858 9dce5a81-9a42-0410-99e4-3799d3902e7f
This commit is contained in:
Ian
2014-07-05 11:38:51 +02:00
parent f802658d10
commit cb220b6c94
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bundled-libs/Smarty/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;