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

- bugfix yesterdays fix could result in an undefined variable

Browse Source
This commit is contained in:
Uwe.Tews@googlemail.com
2013-10-14 07:47:49 +00:00
parent c3994f4006
commit fccd80818b
2 changed files with 5 additions and 0 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.10.2013
- bugfix yesterdays fix could result in an undefined variable
13.10.2013 13.10.2013
- bugfix variable names on {include} in template inheritance did unextepted error message (forum topic 24594) (Issue 161) - bugfix variable names on {include} in template inheritance did unextepted error message (forum topic 24594) (Issue 161)
.- bugfix relative includes with same name like {include './foo.tpl'} from different folder failed (forum topic 24590)(Issue 161) .- bugfix relative includes with same name like {include './foo.tpl'} from different folder failed (forum topic 24590)(Issue 161)

2
libs/sysplugins/smarty_resource.php
View File

@@ -532,6 +532,8 @@ abstract class Smarty_Resource
$_file_is_dotted = $name[0] == '.' && ($name[1] == '.' || $name[1] == '/' || $name[1] == "\\"); $_file_is_dotted = $name[0] == '.' && ($name[1] == '.' || $name[1] == '/' || $name[1] == "\\");
if ($_template->parent instanceof Smarty_Internal_Template && $_file_is_dotted && ($_template->parent->source->type == 'file' || $_template->parent->source->type == 'extends')) { if ($_template->parent instanceof Smarty_Internal_Template && $_file_is_dotted && ($_template->parent->source->type == 'file' || $_template->parent->source->type == 'extends')) {
$name2 = dirname($_template->parent->source->filepath) . DS . $name; $name2 = dirname($_template->parent->source->filepath) . DS . $name;
} else {
$name2 = $name;
} }
$unique_resource_name = $resource->buildUniqueResourceName($smarty, $name2); $unique_resource_name = $resource->buildUniqueResourceName($smarty, $name2);