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

apply modifiers only once to section-loop and foreach-from attributes

Browse Source
This commit is contained in:
messju
2003-09-16 08:15:58 +00:00
parent 82ed1ec63e
commit 77ff6cf28b
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -1,3 +1,5 @@
- apply modifiers only once to section-loop and foreach-from attrs (messju)
- remove use of _smarty_cached_paths-files (messju)
- remove Smarty::_plugin_implementation_exists() - use is_callable() (messju) - remove Smarty::_plugin_implementation_exists() - use is_callable() (messju)
- ignore {strip}/{/strip) inside {strip}-blocks (messju) - ignore {strip}/{/strip) inside {strip}-blocks (messju)
- fixed removal of leading/trailing newlines in {strip}-blocks (messju) - fixed removal of leading/trailing newlines in {strip}-blocks (messju)

14
libs/Smarty_Compiler.class.php
View File

@@ -496,13 +496,13 @@ class Smarty_Compiler extends Smarty {
case 'foreachelse': case 'foreachelse':
$this->_foreachelse_stack[count($this->_foreachelse_stack)-1] = true; $this->_foreachelse_stack[count($this->_foreachelse_stack)-1] = true;
return "<?php endforeach; else: ?>"; return "<?php endforeach; unset(\$_from); else: ?>";
case '/foreach': case '/foreach':
if (array_pop($this->_foreachelse_stack)) if (array_pop($this->_foreachelse_stack))
return "<?php endif; ?>"; return "<?php endif; ?>";
else else
return "<?php endforeach; endif; ?>"; return "<?php endforeach; unset(\$_from); endif; ?>";
case 'strip': case 'strip':
case '/strip': case '/strip':
@@ -967,7 +967,7 @@ class Smarty_Compiler extends Smarty {
foreach ($attrs as $attr_name => $attr_value) { foreach ($attrs as $attr_name => $attr_value) {
switch ($attr_name) { switch ($attr_name) {
case 'loop': case 'loop':
$output .= "{$section_props}['loop'] = is_array($attr_value) ? count($attr_value) : max(0, (int)$attr_value);\n"; $output .= "{$section_props}['loop'] = is_array(\$_loop=$attr_value) ? count(\$_loop) : max(0, (int)\$_loop); unset(\$_loop);\n";
break; break;
case 'show': case 'show':
@@ -1095,17 +1095,17 @@ class Smarty_Compiler extends Smarty {
} }
if (isset($name)) { if (isset($name)) {
$output .= "{$foreach_props}['total'] = count((array)$from);\n"; $output .= "{$foreach_props}['total'] = count(\$_from = (array)$from);\n";
$output .= "{$foreach_props}['show'] = {$foreach_props}['total'] > 0;\n"; $output .= "{$foreach_props}['show'] = {$foreach_props}['total'] > 0;\n";
$output .= "if ({$foreach_props}['show']):\n"; $output .= "if ({$foreach_props}['show']):\n";
$output .= "{$foreach_props}['iteration'] = 0;\n"; $output .= "{$foreach_props}['iteration'] = 0;\n";
$output .= " foreach ((array)$from as $key_part\$this->_tpl_vars['$item']):\n"; $output .= " foreach (\$_from as $key_part\$this->_tpl_vars['$item']):\n";
$output .= " {$foreach_props}['iteration']++;\n"; $output .= " {$foreach_props}['iteration']++;\n";
$output .= " {$foreach_props}['first'] = ({$foreach_props}['iteration'] == 1);\n"; $output .= " {$foreach_props}['first'] = ({$foreach_props}['iteration'] == 1);\n";
$output .= " {$foreach_props}['last'] = ({$foreach_props}['iteration'] == {$foreach_props}['total']);\n"; $output .= " {$foreach_props}['last'] = ({$foreach_props}['iteration'] == {$foreach_props}['total']);\n";
} else { } else {
$output .= "if (count((array)$from)):\n"; $output .= "if (count(\$_from = (array)$from)):\n";
$output .= " foreach ((array)$from as $key_part\$this->_tpl_vars['$item']):\n"; $output .= " foreach (\$_from as $key_part\$this->_tpl_vars['$item']):\n";
} }
$output .= '?>'; $output .= '?>';