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

- bugfix template inheritance did produce wrong code if subtemplates with {block} was

Browse Source 
included several times (from smarty-developers forum)
This commit is contained in:
uwe.tews@googlemail.com
2012-08-15 15:09:12 +00:00
parent b977381e4e
commit 090ba8e7c5
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
change_log.txt
View File

@@ -1,4 +1,8 @@
===== trunk ===== ===== trunk =====
15.08.2012
- bugfix template inheritance did produce wrong code if subtemplates with {block} was
included several times (from smarty-developers forum)
14.08.2012 14.08.2012
- bugfix PHP5.2 compatibility compromised by SplFileInfo::getBasename() (Issue 110) - bugfix PHP5.2 compatibility compromised by SplFileInfo::getBasename() (Issue 110)

2
libs/sysplugins/smarty_internal_templatecompilerbase.php
View File

@@ -215,6 +215,8 @@ abstract class Smarty_Internal_TemplateCompilerBase {
} else { } else {
$code = $template_header . $template->createTemplateCodeFrame($_compiled_code) . $merged_code; $code = $template_header . $template->createTemplateCodeFrame($_compiled_code) . $merged_code;
} }
// unset content because template inheritance could have replace source with parent code
unset ($template->source->content);
return $code; return $code;
} }