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 {$smarty.section.name.loop} used together with {$smarty.section.name.total} could produce

Browse Source 
wrong results (forum topic 27041) 3.1.32-dev-35
This commit is contained in:
Uwe Tews
2017-11-06 04:58:02 +01:00
parent 3fc8abeb98
commit 5220ca6776
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
change_log.txt
View File

@@ -2,6 +2,8 @@
05.11.2017 05.11.2017
- lexer/parser optimization - lexer/parser optimization
- code cleanup and optimizations - code cleanup and optimizations
- bugfix {$smarty.section.name.loop} used together with {$smarty.section.name.total} could produce
wrong results (forum topic 27041)
26.10.2017 26.10.2017
- bugfix Smarty version was not filled in header comment of compiled and cached files - bugfix Smarty version was not filled in header comment of compiled and cached files

2
libs/Smarty.class.php
View File

@@ -112,7 +112,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* smarty version * smarty version
*/ */
const SMARTY_VERSION = '3.1.32-dev-34'; const SMARTY_VERSION = '3.1.32-dev-35';
/** /**
* define variable scopes * define variable scopes
*/ */

11
libs/sysplugins/smarty_internal_compile_section.php
View File

@@ -141,12 +141,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
$v = "(is_array(@\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop))"; $v = "(is_array(@\$_loop=$attr_value) ? count(\$_loop) : max(0, (int) \$_loop))";
$t = 1; $t = 1;
} }
if (isset($namedAttr[ 'loop' ])) {
$initNamedProperty[ 'loop' ] = "'loop' => {$v}";
if ($t === 1) { if ($t === 1) {
$v = "{$sectionVar}->value['loop']";
}
} elseif ($t === 1) {
$initLocal[ 'loop' ] = $v; $initLocal[ 'loop' ] = $v;
$v = "{$local}loop"; $v = "{$local}loop";
} }
@@ -338,7 +333,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
} }
if (isset($namedAttr[ 'loop' ])) { if (isset($namedAttr[ 'loop' ])) {
$initNamedProperty[ 'loop' ] = "'loop' => {$propValue['total']}"; $initNamedProperty[ 'loop' ] = "'loop' => {$propValue['loop']}";
} }
if (isset($namedAttr[ 'total' ])) { if (isset($namedAttr[ 'total' ])) {
$initNamedProperty[ 'total' ] = "'total' => {$propValue['total']}"; $initNamedProperty[ 'total' ] = "'total' => {$propValue['total']}";
@@ -393,7 +388,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo
if (isset($namedAttr[ 'last' ])) { if (isset($namedAttr[ 'last' ])) {
$output .= "{$sectionVar}->value['last'] = ({$propValue['iteration']} === {$propValue['total']});\n"; $output .= "{$sectionVar}->value['last'] = ({$propValue['iteration']} === {$propValue['total']});\n";
} }
$output .= "?>"; $output .= '?>';
return $output; return $output;
} }
@@ -463,7 +458,7 @@ class Smarty_Internal_Compile_Sectionclose extends Smarty_Internal_CompileBase
$output .= "if ({$local}saved) {\n"; $output .= "if ({$local}saved) {\n";
$output .= "{$sectionVar} = {$local}saved;\n"; $output .= "{$sectionVar} = {$local}saved;\n";
$output .= "}\n"; $output .= "}\n";
$output .= "?>"; $output .= '?>';
return $output; return $output;
} }