From 0e87a99507c9acd6ebc10110014060c8f283474d Mon Sep 17 00:00:00 2001
From: Uwe Tews <uwe.tews@googlemail.com>
Date: Wed, 11 Feb 2015 07:15:40 +0100
Subject: [PATCH] - bugfix recursive {includes} did create E_NOTICE message
 when $smarty->$merge_compiled_includes = true;

---
 libs/Smarty.class.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
index e0da536c..e42a9713 100644
--- a/libs/Smarty.class.php
+++ b/libs/Smarty.class.php
@@ -699,17 +699,19 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * fetches a rendered Smarty template
      *
-     * @param  string $template   the resource handle of the template file or template object
-     * @param  mixed  $cache_id   cache id to be used with this template
-     * @param  mixed  $compile_id compile id to be used with this template
-     * @param  object $parent     next higher level of Smarty variables
-     * @param  bool   $display    true: display, false: fetch
+     * @param  string $template         the resource handle of the template file or template object
+     * @param  mixed  $cache_id         cache id to be used with this template
+     * @param  mixed  $compile_id       compile id to be used with this template
+     * @param  object $parent           next higher level of Smarty variables
+     * @param  bool   $display          true: display, false: fetch
+     * @param  bool   $merge_tpl_vars   not used - left for BC
+     * @param  bool   $no_output_filter not used - left for BC
      *
      * @throws Exception
      * @throws SmartyException
      * @return string rendered template output
      */
-    public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false)
+    public function fetch($template = null, $cache_id = null, $compile_id = null, $parent = null, $display = false, $merge_tpl_vars = true, $no_output_filter = false)
     {
         if ($cache_id !== null && is_object($cache_id)) {
             $parent = $cache_id;
@@ -1060,7 +1062,7 @@ class Smarty extends Smarty_Internal_TemplateBase
      *
      * @param string       $dirName directory property name
      * @param string|array $dir     directory string or array of strings
-     * @param mixed         $key     optional key
+     * @param mixed        $key     optional key
      */
     private function _addDir($dirName, $dir, $key = null)
     {