diff options
| author | Uwe.Tews@googlemail.com <Uwe.Tews@googlemail.com> | 2014-01-18 14:43:02 +0000 |
|---|---|---|
| committer | Uwe.Tews@googlemail.com <Uwe.Tews@googlemail.com> | 2014-01-18 14:43:02 +0000 |
| commit | 290dd3f73f08184b2c0845ef509648b382276e2a (patch) | |
| tree | 40c3fc874eda900f22b10bdac7b16461b3bde1e3 | |
| parent | 1dfbe19ebf7bf72bdbd661f7fe926e7ecb226dc8 (diff) | |
| download | smarty-290dd3f73f08184b2c0845ef509648b382276e2a.tar.gz smarty-290dd3f73f08184b2c0845ef509648b382276e2a.tar.bz2 smarty-290dd3f73f08184b2c0845ef509648b382276e2a.zip | |
- bugfix the compiler did fail when using template inheritance and recursive {include} (smarty-developers group)
| -rw-r--r-- | change_log.txt | 5 | ||||
| -rw-r--r-- | libs/sysplugins/smarty_internal_compile_include.php | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/change_log.txt b/change_log.txt index af6db318..d6affe73 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,5 +1,8 @@ ===== trunk ===== - 11.01.2014 + 18.01.2014 + - bugfix the compiler did fail when using template inheritance and recursive {include} (smarty-developers group) + + 11.01.2014 - bugfix "* }" (spaces before right delimiter) was interpreted by mistake as comment end tag (Issue 170) - internals content cache should be clear when updating cache file diff --git a/libs/sysplugins/smarty_internal_compile_include.php b/libs/sysplugins/smarty_internal_compile_include.php index 1ea8b577..27ad617e 100644 --- a/libs/sysplugins/smarty_internal_compile_include.php +++ b/libs/sysplugins/smarty_internal_compile_include.php @@ -166,7 +166,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase $nocache = false; $_smarty_tpl = $compiler->template; eval("\$tpl_name = $include_file;"); - if (!isset($compiler->smarty->merged_templates_func[$tpl_name][$uid]) || $compiler->inheritance) { + if (!isset($compiler->smarty->merged_templates_func[$tpl_name][$uid])) { $tpl = new $compiler->smarty->template_class ($tpl_name, $compiler->smarty, $compiler->template, $compiler->template->cache_id, $compiler->template->compile_id); // save unique function name $compiler->smarty->merged_templates_func[$tpl_name][$uid]['func'] = $tpl->properties['unifunc'] = 'content_' . str_replace('.', '_', uniqid('', true)); |