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

- 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

Browse Source
This commit is contained in:
uwetews
2016-07-12 00:24:11 +02:00
parent b46a9a8dbd
commit b525d4d1d7
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,4 +1,7 @@
 ===== 3.1.30-dev ===== (xx.xx.xx)  ===== 3.1.30-dev ===== (xx.xx.xx)
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
27.05.2016 27.05.2016
- bugfix/improvement of compileAlltemplates() follow symlinks in template folder (PHP >= 5.3.1) https://github.com/smarty-php/smarty/issues/224 - bugfix/improvement of compileAlltemplates() follow symlinks in template folder (PHP >= 5.3.1) https://github.com/smarty-php/smarty/issues/224
clear internal cache and expension handler for each template to avoid possible conflicts https://github.com/smarty-php/smarty/issues/231 clear internal cache and expension handler for each template to avoid possible conflicts https://github.com/smarty-php/smarty/issues/231

2
libs/Smarty.class.php
View File

@@ -121,7 +121,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* smarty version * smarty version
*/ */
const SMARTY_VERSION = '3.1.30-dev/72'; const SMARTY_VERSION = '3.1.30-dev/73';
/** /**
* define variable scopes * define variable scopes

12
libs/sysplugins/smarty_internal_runtime_foreach.php
View File

@@ -42,27 +42,23 @@ class Smarty_Internal_Runtime_Foreach
settype($from, 'array'); settype($from, 'array');
} }
$total = ($needTotal || isset($properties[ 'total' ])) ? $this->count($from) : 1; $total = ($needTotal || isset($properties[ 'total' ])) ? $this->count($from) : 1;
if (isset($tpl->tpl_vars[ $item ])) {
$saveVars[ $item ] = $tpl->tpl_vars[ $item ];
}
$tpl->tpl_vars[ $item ] = new Smarty_Variable(null, $tpl->isRenderingCache);
if (empty($from)) { if (empty($from)) {
$from = null; $from = null;
$total = 0; $total = 0;
if ($needTotal) { if ($needTotal) {
if (isset($tpl->tpl_vars[ $item ])) {
$saveVars[ $item ] = $tpl->tpl_vars[ $item ];
}
$tpl->tpl_vars[ $item ] = new Smarty_Variable(null, $tpl->isRenderingCache);
$tpl->tpl_vars[ $item ]->total = 0; $tpl->tpl_vars[ $item ]->total = 0;
} }
} else { } else {
if (isset($tpl->tpl_vars[ $item ])) {
$saveVars[ $item ] = $tpl->tpl_vars[ $item ];
}
if ($key) { if ($key) {
if (isset($tpl->tpl_vars[ $key ])) { if (isset($tpl->tpl_vars[ $key ])) {
$saveVars[ $key ] = $tpl->tpl_vars[ $key ]; $saveVars[ $key ] = $tpl->tpl_vars[ $key ];
} }
$tpl->tpl_vars[ $key ] = new Smarty_Variable(null, $tpl->isRenderingCache); $tpl->tpl_vars[ $key ] = new Smarty_Variable(null, $tpl->isRenderingCache);
} }
$tpl->tpl_vars[ $item ] = new Smarty_Variable(null, $tpl->isRenderingCache);
if ($needTotal) { if ($needTotal) {
$tpl->tpl_vars[ $item ]->total = $total; $tpl->tpl_vars[ $item ]->total = $total;
} }