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} did fail if from atrribute is a Generator class https://github.com/smarty-php/smarty/issues/128

Browse Source
This commit is contained in:
uwetews
2015-12-16 03:25:33 +01:00
parent e1eefdca75
commit fa3aed33ee
4 changed files with 13 additions and 5 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.29-dev ===== (xx.xx.2015)  ===== 3.1.29-dev ===== (xx.xx.2015)
16.12.2015
- bugfix {foreach} did fail if from atrribute is a Generator class https://github.com/smarty-php/smarty/issues/128
15.12.2015 15.12.2015
- bugfix {$smarty.cookies.foo} did return the $_COOKIE array not the 'foo' value https://github.com/smarty-php/smarty/issues/122 - bugfix {$smarty.cookies.foo} did return the $_COOKIE array not the 'foo' value https://github.com/smarty-php/smarty/issues/122
- bugfix a call to clearAllCache() and other should clear all internal template object caches (forum topic 25828) - bugfix a call to clearAllCache() and other should clear all internal template object caches (forum topic 25828)

2
libs/Smarty.class.php
View File

@@ -118,7 +118,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* smarty version * smarty version
*/ */
const SMARTY_VERSION = '3.1.29-dev/5'; const SMARTY_VERSION = '3.1.29-dev/6';
/** /**
* define variable scopes * define variable scopes

10
libs/sysplugins/smarty_internal_compile_foreach.php
View File

@@ -183,8 +183,10 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo
foreach ($saveVars as $k => $code) { foreach ($saveVars as $k => $code) {
$output .= "{$local}{$k} = {$code}\n"; $output .= "{$local}{$k} = {$code}\n";
} }
if (isset($itemAttr['show']) || isset($itemAttr['total']) || isset($namedAttr['total']) || isset($namedAttr['show']) || isset($itemAttr['last']) || isset($namedAttr['last'])) {
$output .= "{$local}total = \$_smarty_tpl->smarty->ext->_foreach->count(\$_from);\n";
}
$output .= "{$itemVar} = new Smarty_Variable();\n"; $output .= "{$itemVar} = new Smarty_Variable();\n";
$output .= "{$local}total = \$_smarty_tpl->smarty->ext->_foreach->count(\$_from);\n";
if (isset($itemAttr['show'])) { if (isset($itemAttr['show'])) {
$output .= "{$itemVar}->show = ({$local}total > 0);\n"; $output .= "{$itemVar}->show = ({$local}total > 0);\n";
} }
@@ -210,7 +212,6 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo
$output .= "{$foreachVar} = new Smarty_Variable({$_vars});\n"; $output .= "{$foreachVar} = new Smarty_Variable({$_vars});\n";
} }
} }
$output .= "if ({$local}total) {\n";
if (isset($attributes['key'])) { if (isset($attributes['key'])) {
$output .= "\$_smarty_tpl->tpl_vars['{$key}'] = new Smarty_Variable();\n"; $output .= "\$_smarty_tpl->tpl_vars['{$key}'] = new Smarty_Variable();\n";
} }
@@ -226,7 +227,9 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo
if ($needIteration) { if ($needIteration) {
$output .= "{$local}iteration=0;\n"; $output .= "{$local}iteration=0;\n";
} }
$output .= "{$itemVar}->_loop = false;\n";
$output .= "foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n"; $output .= "foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n";
$output .= "{$itemVar}->_loop = true;\n";
if (isset($attributes['key']) && isset($itemAttr['key'])) { if (isset($attributes['key']) && isset($itemAttr['key'])) {
$output .= "\$_smarty_tpl->tpl_vars['{$key}']->value = {$itemVar}->key;\n"; $output .= "\$_smarty_tpl->tpl_vars['{$key}']->value = {$itemVar}->key;\n";
} }
@@ -296,7 +299,7 @@ class Smarty_Internal_Compile_Foreachelse extends Smarty_Internal_CompileBase
$output = "<?php\n"; $output = "<?php\n";
$output .= "{$itemVar} = {$local}saved_local_item;\n"; $output .= "{$itemVar} = {$local}saved_local_item;\n";
$output .= "}\n"; $output .= "}\n";
$output .= "} else {\n?>"; $output .= "if (!{$itemVar}->_loop) {\n?>";
return $output; return $output;
} }
} }
@@ -332,7 +335,6 @@ class Smarty_Internal_Compile_Foreachclose extends Smarty_Internal_CompileBase
if ($restore) { if ($restore) {
$output .= "{$itemVar} = {$local}saved_local_item;\n"; $output .= "{$itemVar} = {$local}saved_local_item;\n";
$output .= "}\n";
} }
$output .= "}\n"; $output .= "}\n";
foreach ($restoreVars as $restore) { foreach ($restoreVars as $restore) {

3
libs/sysplugins/smarty_internal_runtime_foreach.php
View File

@@ -27,6 +27,9 @@ class Smarty_Internal_Runtime_Foreach
// thus rewind() and valid() methods may not be present // thus rewind() and valid() methods may not be present
return iterator_count($value->getIterator()); return iterator_count($value->getIterator());
} elseif ($value instanceof Iterator) { } elseif ($value instanceof Iterator) {
if ($value instanceof Generator) {
return 1;
}
return iterator_count($value); return iterator_count($value);
} elseif ($value instanceof PDOStatement) { } elseif ($value instanceof PDOStatement) {
return $value->rowCount(); return $value->rowCount();