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

- fixed compile_id handling on {include} tags

Browse Source
This commit is contained in:
Uwe.Tews
2009-04-14 10:31:02 +00:00
parent 04fc33b99a
commit 3d0b7663e2
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -1,4 +1,5 @@
04/14/2009 04/14/2009
- fixed compile_id handling on {include} tags
- fixed append/prepend attributes in {block} tag - fixed append/prepend attributes in {block} tag
- added {if 'expression' is in 'array'} syntax - added {if 'expression' is in 'array'} syntax
- use crc32 as hash for compiled config files. - use crc32 as hash for compiled config files.

8
libs/sysplugins/internal.compile_include.php
View File

@@ -73,7 +73,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
unset ($_template); unset ($_template);
} }
// create template object // create template object
$_output = "<?php \$_template = new Smarty_Template ($include_file, \$_smarty_tpl);"; $_output = "<?php \$_template = new Smarty_Template ($include_file, \$_smarty_tpl, \$_smarty_tpl->cache_id, \$_smarty_tpl->compile_id);";
// delete {include} standard attributes // delete {include} standard attributes
unset($_attr['file'], $_attr['assign'], $_attr['caching_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope']); unset($_attr['file'], $_attr['assign'], $_attr['caching_lifetime'], $_attr['nocache'], $_attr['caching'], $_attr['scope']);
// remaining attributes must be assigned as smarty variable // remaining attributes must be assigned as smarty variable
@@ -98,11 +98,11 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase {
} }
// was there an assign attribute // was there an assign attribute
if (isset($_assign)) { if (isset($_assign)) {
$_output .= "\$_smarty_tpl->assign($_assign,\$_smarty_tpl->smarty->fetch(\$_template, null, \$_smarty_tpl->cache_id, \$_smarty_tpl->compile_id)); ?>"; $_output .= "\$_smarty_tpl->assign($_assign,\$_smarty_tpl->smarty->fetch(\$_template); ?>";
} else { } else {
$_output .= "echo \$_smarty_tpl->smarty->fetch(\$_template, null, \$_smarty_tpl->cache_id, \$_smarty_tpl->compile_id); ?>"; $_output .= "echo \$_smarty_tpl->smarty->fetch(\$_template); ?>";
} }
if ($_parent_scope != '0') { if ($_parent_scope != SMARTY_LOCAL_SCOPE) {
$_output .= "<?php \$_template->updateParentVariables($_parent_scope); ?>"; $_output .= "<?php \$_template->updateParentVariables($_parent_scope); ?>";
} }
return $_output; return $_output;