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 Smarty's internal header code must be excluded from postfilters (issue 71)

Browse Source
This commit is contained in:
uwe.tews@googlemail.com
2011-12-28 18:51:20 +00:00
parent d6abd3155d
commit 05f17be99a
2 changed files with 12 additions and 5 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 =====
28.12.2011
- bugfix Smarty's internal header code must be excluded from postfilters (issue 71)
22.12.2011 22.12.2011
- bugfix the new lexer of 17.12.2011 did fail if mbstring.func_overload != 0 (issue 70) (Forum Topic 20680) - bugfix the new lexer of 17.12.2011 did fail if mbstring.func_overload != 0 (issue 70) (Forum Topic 20680)
- bugfix template inheritace did fail if mbstring.func_overload != 0 (issue 70) (Forum Topic 20680) - bugfix template inheritace did fail if mbstring.func_overload != 0 (issue 70) (Forum Topic 20680)

14
libs/sysplugins/smarty_internal_templatecompilerbase.php
View File

@@ -176,20 +176,24 @@ abstract class Smarty_Internal_TemplateCompilerBase {
self::$_tag_objects = array(); self::$_tag_objects = array();
// return compiled code to template object // return compiled code to template object
$merged_code = ''; $merged_code = '';
if (!$this->suppressMergedTemplates) { if (!$this->suppressMergedTemplates && !empty($this->merged_templates)) {
foreach ($this->merged_templates as $code) { foreach ($this->merged_templates as $code) {
$merged_code .= $code; $merged_code .= $code;
} }
// run postfilter if required on merged code
if (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) {
$merged_code = Smarty_Internal_Filter_Handler::runFilter('post', $merged_code, $template);
}
}
// run postfilter if required on compiled template code
if (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) {
$_compiled_code = Smarty_Internal_Filter_Handler::runFilter('post', $_compiled_code, $template);
} }
if ($this->suppressTemplatePropertyHeader) { if ($this->suppressTemplatePropertyHeader) {
$code = $_compiled_code . $merged_code; $code = $_compiled_code . $merged_code;
} else { } else {
$code = $template_header . $template->createTemplateCodeFrame($_compiled_code) . $merged_code; $code = $template_header . $template->createTemplateCodeFrame($_compiled_code) . $merged_code;
} }
// run postfilter if required
if (isset($this->smarty->autoload_filters['post']) || isset($this->smarty->registered_filters['post'])) {
$code = Smarty_Internal_Filter_Handler::runFilter('post', $code, $template);
}
return $code; return $code;
} }