From 83a68c99c85f3ea84c4898263fb331ddc8d9c5ca Mon Sep 17 00:00:00 2001 From: uwetews Date: Tue, 15 Sep 2015 00:44:34 +0200 Subject: [PATCH] - update template inheritance processing --- libs/sysplugins/smarty_template_compiled.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/sysplugins/smarty_template_compiled.php b/libs/sysplugins/smarty_template_compiled.php index ffa5f1f1..641cccd3 100644 --- a/libs/sysplugins/smarty_template_compiled.php +++ b/libs/sysplugins/smarty_template_compiled.php @@ -151,11 +151,11 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base $_template->smarty->compile_check = $compileCheck; } } - if ($_template->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_AUTOMATIC && isset($_template->parent) && - isset($_template->parent->compiled) && !$_template->source->isConfig && - !in_array($_template->source->type, array('eval', 'string')) && + if (isset($_template->parent) && isset($_template->parent->compiled) && !empty($_template->parent->compiled->includes) && - isset($_template->smarty->_cache['template_objects'][$_template->_getTemplateId()]) + $_template->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_AUTOMATIC && + !$_template->source->handler->recompiled && $_template->source->type != 'string' && + !isset($_template->smarty->_cache['template_objects'][$_template->_getTemplateId()]) ) { foreach ($_template->parent->compiled->includes as $key => $count) { $_template->compiled->includes[$key] = @@ -232,7 +232,6 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base public function compileTemplateSource(Smarty_Internal_Template $_template) { $_template->source->compileds = array(); - $_template->isChild = false; $this->file_dependency = array(); $this->tpl_function = array(); $this->includes = array();