- bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (for…

…um topic 25508) 2nd fix
smarty-php · Apr 28, 2015 · ea17aad · ea17aad
1 parent e312dd9
commit ea17aad
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git 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) 2nd fix
+
  28.04.2015
   - bugfix plugins of merged subtemplates not loaded in 3.1.22-dev (forum topic 25508)
 

diff --git 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/20';
+    const SMARTY_VERSION = '3.1.22-dev/21';
 
     /**
      * define variable scopes

diff --git a/libs/sysplugins/smarty_internal_compile_include.php b/libs/sysplugins/smarty_internal_compile_include.php
@@ -211,7 +211,20 @@ public function compile($args, Smarty_Internal_SmartyTemplateCompiler $compiler,
                     }
                     $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);
+                    if (!empty($tpl->required_plugins['compiled'])) {
+                        foreach ($tpl->required_plugins['compiled'] as $name => $callBack) {
+                            if (!isset($compiler->template->required_plugins['compiled'][$name])) {
+                                $compiler->template->required_plugins['compiled'][$name] = $callBack;
+                            }
+                        }
+                    }
+                    if (!empty($tpl->required_plugins['nocache'])) {
+                        foreach ($tpl->required_plugins['nocache'] as $name => $callBack) {
+                            if (!isset($compiler->template->required_plugins['nocache'][$name])) {
+                                $compiler->template->required_plugins['nocache'][$name] = $callBack;
+                            }
+                        }
+                    }
                     unset ($tpl);
                 }
             } else {