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

- improvement/bugfix when Smarty::fetch() is called on a template object the inheritance and tplFunctions property

Browse Source 
should be copied to the called template object
This commit is contained in:
uwetews
2016-10-23 18:48:17 +02:00
parent d79edd2fe0
commit 98efe22e02
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/sysplugins/smarty_internal_templatebase.php
View File

@@ -169,7 +169,14 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
if ($this->_objType == 1) { if ($this->_objType == 1) {
// set caching in template object // set caching in template object
$template->caching = $this->caching; $template->caching = $this->caching;
} else { }
}
// fetch template content
$level = ob_get_level();
try {
$_smarty_old_error_level =
isset($smarty->error_reporting) ? error_reporting($smarty->error_reporting) : null;
if ($this->_objType == 2) {
/* @var Smarty_Internal_Template $this */ /* @var Smarty_Internal_Template $this */
$template->tplFunctions = $this->tplFunctions; $template->tplFunctions = $this->tplFunctions;
$template->inheritance = $this->inheritance; $template->inheritance = $this->inheritance;
@@ -178,12 +185,6 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data
if (isset($parent->_objType) && ($parent->_objType == 2) && !empty($parent->tplFunctions)) { if (isset($parent->_objType) && ($parent->_objType == 2) && !empty($parent->tplFunctions)) {
$template->tplFunctions = array_merge($parent->tplFunctions, $template->tplFunctions); $template->tplFunctions = array_merge($parent->tplFunctions, $template->tplFunctions);
} }
}
// fetch template content
$level = ob_get_level();
try {
$_smarty_old_error_level =
isset($smarty->error_reporting) ? error_reporting($smarty->error_reporting) : null;
if ($function == 2) { if ($function == 2) {
if ($template->caching) { if ($template->caching) {
// return cache status of template // return cache status of template