diff options
| -rw-r--r-- | change_log.txt | 3 | ||||
| -rw-r--r-- | libs/Smarty.class.php | 2 | ||||
| -rw-r--r-- | libs/sysplugins/smarty_internal_template.php | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/change_log.txt b/change_log.txt index b1480b6f..a9cb3aa7 100644 --- a/change_log.txt +++ b/change_log.txt @@ -3,7 +3,8 @@ - bugfix PHP 7 compatibility on registered compiler plugins https://github.com/smarty-php/smarty/issues/241 - update testInstall() https://github.com/smarty-php/smarty/issues/248https://github.com/smarty-php/smarty/issues/248 - bugfix enable debugging could fail when template objects did already exists https://github.com/smarty-php/smarty/issues/237 - + - bugfix template function data should be merged when loading subtemplate https://github.com/smarty-php/smarty/issues/240 + 12.07.2016 - bugfix {foreach} item variable must be created also on empty from array https://github.com/smarty-php/smarty/issues/238 and https://github.com/smarty-php/smarty/issues/239 - bugfix enableSecurity() must init cache flags https://github.com/smarty-php/smarty/issues/247 diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index 904ecd7d..41a6b281 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -121,7 +121,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * smarty version */ - const SMARTY_VERSION = '3.1.30-dev/77'; + const SMARTY_VERSION = '3.1.30-dev/78'; /** * define variable scopes diff --git a/libs/sysplugins/smarty_internal_template.php b/libs/sysplugins/smarty_internal_template.php index 4b7f96c0..c4cfc75c 100644 --- a/libs/sysplugins/smarty_internal_template.php +++ b/libs/sysplugins/smarty_internal_template.php @@ -482,7 +482,7 @@ class Smarty_Internal_Template extends Smarty_Internal_TemplateBase // $tpl->compiled->nocache_hash = $properties['nocache_hash']; $resource->file_dependency = $properties[ 'file_dependency' ]; if (isset($properties[ 'tpl_function' ])) { - $tpl->tpl_function = $properties[ 'tpl_function' ]; + $tpl->tpl_function = array_merge($tpl->tpl_function, $properties[ 'tpl_function' ]); } } return $is_valid && !function_exists($properties[ 'unifunc' ]); |