- bugfix {foreach} and {section} with uppercase characters in name attribute did not work (forum topic 25819)

This commit is contained in:
uwetews
2015-12-13 06:30:08 +01:00
parent 71e364e4b2
commit 6dc9196c35
3 changed files with 10 additions and 8 deletions

View File

@@ -1,4 +1,7 @@
 ===== 3.1.28-dev===== (xx.xx.2015)  ===== 3.1.28-dev===== (xx.xx.2015)
13.12.2015
- bugfix {foreach} and {section} with uppercase characters in name attribute did not work (forum topic 25819)
09.12.2015 09.12.2015
- bugix Smarty did fail under PHP 7.0.0 with use_include_path = true; - bugix Smarty did fail under PHP 7.0.0 with use_include_path = true;

View File

@@ -118,7 +118,7 @@ class Smarty extends Smarty_Internal_TemplateBase
/** /**
* smarty version * smarty version
*/ */
const SMARTY_VERSION = '3.1.28-dev/79'; const SMARTY_VERSION = '3.1.28-dev/80';
/** /**
* define variable scopes * define variable scopes

View File

@@ -206,16 +206,15 @@ class Smarty_Internal_Compile_Private_ForeachSection extends Smarty_Internal_Com
*/ */
public static function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter) public static function compileSpecialVariable($args, Smarty_Internal_TemplateCompilerBase $compiler, $parameter)
{ {
// make all lower case $tag = strtolower(trim($parameter[ 0 ], '"\''));
$parameter = array_map('strtolower', $parameter); $name = isset($parameter[ 1 ]) ? $compiler->getId($parameter[ 1 ]) : false;
$tag = trim($parameter[0], '"\''); if (!$name) {
if (!isset($parameter[1]) || false === $name = $compiler->getId($parameter[1])) {
$compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true); $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} name attribute", null, true);
} }
/* @var Smarty_Internal_Compile_Foreach|Smarty_Internal_Compile_Section $className */
$className = 'Smarty_Internal_Compile_' . ucfirst($tag); $className = 'Smarty_Internal_Compile_' . ucfirst($tag);
if ((!isset($parameter[2]) || false === $property = $compiler->getId($parameter[2])) || $property = isset($parameter[ 2 ]) ? strtolower($compiler->getId($parameter[ 2 ])) : false;
!in_array($property, $className::$nameProperties) if (!$property || !in_array($property, $className::$nameProperties)) {
) {
$compiler->trigger_template_error("missing or illegal \$smarty.{$tag} property attribute", null, true); $compiler->trigger_template_error("missing or illegal \$smarty.{$tag} property attribute", null, true);
} }
$tagVar = "'__smarty_{$tag}_{$name}'"; $tagVar = "'__smarty_{$tag}_{$name}'";