From 039d9044da3e6758cb2669596f518d1a1dcaed72 Mon Sep 17 00:00:00 2001 From: "Uwe.Tews" Date: Mon, 9 Nov 2009 21:22:28 +0000 Subject: [PATCH] --- libs/sysplugins/smarty_internal_compile_include.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/sysplugins/smarty_internal_compile_include.php b/libs/sysplugins/smarty_internal_compile_include.php index 8edc914a..dc518179 100644 --- a/libs/sysplugins/smarty_internal_compile_include.php +++ b/libs/sysplugins/smarty_internal_compile_include.php @@ -64,8 +64,11 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase { } } } while ($must_compile); - if (isset($prop)) { - $compiler->template->properties = array_merge($compiler->template->properties, $prop); + if (isset($prop['file_dependency'])) { + $compiler->template->properties['file_dependency'] = array_merge($compiler->template->properties['file_dependency'], $prop['file_dependency']); + } + if (isset($prop['function'])) { + $compiler->template->properties['function'] = array_merge($compiler->template->properties['function'], $prop['function']); } $has_compiled_template = true; }