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

- bugfix template function data should be merged when loading subtemplate https://github.com/smarty-php/smarty/issues/240

Browse Source
This commit is contained in:
uwetews
2016-07-13 01:42:54 +02:00
parent 38b13661fe
commit cbea88b3a7
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -3,6 +3,7 @@
- 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

2
libs/Smarty.class.php
View File

@@ -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

2
libs/sysplugins/smarty_internal_template.php
View File

@@ -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' ]);