smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-05 10:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix recursive {includes} did create E_NOTICE message when $smarty->$merge_compiled_includes = true;

Browse Source
This commit is contained in:
Uwe Tews
2015-02-11 07:15:40 +01:00
parent aec380839c
commit 0e87a99507
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libs/Smarty.class.php
View File

@@ -699,17 +699,19 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* fetches a rendered Smarty template * fetches a rendered Smarty template
* *
* @param string $template the resource handle of the template file or template object * @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 $cache_id cache id to be used with this template
* @param mixed $compile_id compile 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 object $parent next higher level of Smarty variables
* @param bool $display true: display, false: fetch * @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 Exception
* @throws SmartyException * @throws SmartyException
* @return string rendered template output * @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)) { if ($cache_id !== null && is_object($cache_id)) {
$parent = $cache_id; $parent = $cache_id;
@@ -1060,7 +1062,7 @@ class Smarty extends Smarty_Internal_TemplateBase
* *
* @param string $dirName directory property name * @param string $dirName directory property name
* @param string|array $dir directory string or array of strings * @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) private function _addDir($dirName, $dir, $key = null)
{ {