From e312dd9b593d7110b8cf66c52e5475e8923f9a59 Mon Sep 17 00:00:00 2001
From: Uwe Tews <uwe.tews@googlemail.com>
Date: Tue, 28 Apr 2015 01:38:45 +0200
Subject: [PATCH] - bugfix plugins of merged subtemplates not loaded in
 3.1.22-dev (forum topic 25508)

---
 change_log.txt                                      | 3 +++
 libs/Smarty.class.php                               | 2 +-
 libs/sysplugins/smarty_internal_compile_include.php | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/change_log.txt b/change_log.txt
index 2e0b397d..2056bf65 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,4 +1,7 @@
  ===== 3.1.22-dev ===== (xx.xx.2015)
+ 28.04.2015
+  - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508)
+ 
  23.04.2015 
   - bugfix a nocache template variable used as parameter at {insert} was by mistake cached
   
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index 7aa42bea..0a810f02 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -111,7 +111,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.22-dev/19';
+    const SMARTY_VERSION = '3.1.22-dev/20';
 
     /**
      * define variable scopes
diff --git a/libs/sysplugins/smarty_internal_compile_include.php b/libs/sysplugins/smarty_internal_compile_include.php
index f013f9fc..a71575cb 100644
--- a/libs/sysplugins/smarty_internal_compile_include.php
+++ b/libs/sysplugins/smarty_internal_compile_include.php
@@ -211,6 +211,7 @@ class Smarty_Internal_Compile_Include extends Smarty_Internal_CompileBase
                     }
                     $compiler->parent_compiler->mergedSubTemplatesCode[$tpl->properties['unifunc']] = $compiled_code;
                     $has_compiled_template = true;
+                    $compiler->template->required_plugins = array_merge_recursive($compiler->template->required_plugins, $tpl->required_plugins);
                     unset ($tpl);
                 }
             } else {