Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix foreachelse on arrayiterators #565

Closed
wants to merge 1 commit into from
+6 −3
Closed

Fix foreachelse on arrayiterators #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions change_log.txt
View file
Open in desktop
@@ -1,3 +1,5 @@
- fix foreachelse on arrayiterators https://github.com/smarty-php/smarty/issues/506

===== 3.1.34 release ===== 05.11.2019
13.01.2020
- fix typo in exception message (JercSi)
Expand Down
7 changes: 4 additions & 3 deletions libs/sysplugins/smarty_internal_compile_foreach.php
View file
Open in desktop
Expand Up @@ -192,7 +192,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
$this->openTag(
$compiler,
'foreach',
array('foreach', $compiler->nocache, $local, $itemVar, empty($itemAttr) ? 1 : 2)
array('foreach', $compiler->nocache, $local, $itemVar, empty($itemAttr) ? 0 : 1)
);
// maybe nocache because of nocache variables
$compiler->nocache = $compiler->nocache | $compiler->tag_nocache;
Expand All @@ -219,8 +219,9 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
if (isset($itemAttr[ 'index' ])) {
$output .= "{$itemVar}->index = -1;\n";
}
$output .= "if (\$_from !== null) {\n";
$output .= "{$itemVar}->do_else = true;\n";
$output .= "foreach (\$_from as {$keyTerm}{$itemVar}->value) {\n";
$output .= "{$itemVar}->do_else = false;\n";
if (isset($attributes[ 'key' ]) && isset($itemAttr[ 'key' ])) {
$output .= "\$_smarty_tpl->tpl_vars['{$key}']->value = {$itemVar}->key;\n";
}
Expand Down Expand Up @@ -296,7 +297,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
if ($restore === 2) {
$output .= "{$itemVar} = {$local}saved;\n";
}
$output .= "}\n} else {\n?>";
$output .= "}\nif ({$itemVar}->do_else) {\n?>";
return $output;
}
}
Expand Down