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

- added {include file='foo.tpl' inline} inline option to merge compiled code of aubtemplate into the calling template

Browse Source
This commit is contained in:
Uwe.Tews
2009-12-16 17:05:31 +00:00
parent 5385475a5e
commit 13448b9b0b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -1,5 +1,6 @@
12/16/2009 12/16/2009
- update of changelog - update of changelog
- added {include file='foo.tpl' inline} inline option to merge compiled code of aubtemplate into the calling template
12/14/2009 12/14/2009
- fixed sideefect of last modification (objects in array index did not work anymore) - fixed sideefect of last modification (objects in array index did not work anymore)

4
libs/sysplugins/smarty_internal_compile_include.php
View File

@@ -30,7 +30,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
// save posible attributes // save posible attributes
$include_file = $_attr['file']; $include_file = $_attr['file'];
$has_compiled_template = false; $has_compiled_template = false;
if ($compiler->smarty->merge_compiled_includes) { if ($compiler->smarty->merge_compiled_includes || isset($_attr['inline'])) {
// check if compiled code can be merged (contains no variable part) // check if compiled code can be merged (contains no variable part)
if (!$compiler->has_variable_string && (substr_count($include_file, '"') == 2 or substr_count($include_file, "'") == 2) and substr_count($include_file, '(') == 0) { if (!$compiler->has_variable_string && (substr_count($include_file, '"') == 2 or substr_count($include_file, "'") == 2) and substr_count($include_file, '(') == 0) {
eval("\$tmp = $include_file;"); eval("\$tmp = $include_file;");
@@ -134,7 +134,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
// create template object // create template object
$_output = "<?php \$_template = new {$compiler->smarty->template_class} ($include_file, \$_smarty_tpl->smarty, \$_smarty_tpl, \$_smarty_tpl->cache_id, \$_smarty_tpl->compile_id, $_caching, $_cache_lifetime);"; $_output = "<?php \$_template = new {$compiler->smarty->template_class} ($include_file, \$_smarty_tpl->smarty, \$_smarty_tpl, \$_smarty_tpl->cache_id, \$_smarty_tpl->compile_id, $_caching, $_cache_lifetime);";
// delete {include} standard attributes // delete {include} standard attributes
unset($_attr['file'], $_attr['assign'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope']); unset($_attr['file'], $_attr['assign'], $_attr['cache_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope'], $_attr['inline']);
// remaining attributes must be assigned as smarty variable // remaining attributes must be assigned as smarty variable
if (!empty($_attr)) { if (!empty($_attr)) {
if ($_parent_scope == SMARTY_LOCAL_SCOPE) { if ($_parent_scope == SMARTY_LOCAL_SCOPE) {