diff --git a/NEW_FEATURES.txt b/NEW_FEATURES.txt index 54a97e68..23fd6cb0 100644 --- a/NEW_FEATURES.txt +++ b/NEW_FEATURES.txt @@ -4,28 +4,6 @@ This file contains a brief description of new features which have been added to Smarty 3.1.30 - Loop optimization {foreach} and {section} - ========================================= - Smarty does optimize the {foreach} and {section} loops by removing code for not needed loop - properties. - The compiler collects needed properties by scanning the current template for $item@property, - $smarty.foreach.name.property and $smarty.section.name.property. - The compiler does not know if additional properties will be needed outside the current template scope. - Additional properties can be generated by adding them with the property attribute. - - Example: - index.tpl - {foreach $from as $item properties=[iteration, index]} - {include 'sub.tpl'} - {$item.total} - {/foreach} - - sub.tpl - {$item.index} {$item.iteration} {$item.total} - - In above example code for the 'total' property is automatically generated as $item.total is used in - index.tpl. Code for 'iteration' and 'index' must be added with properties=[iteration, index]. - New tag {make_nocache} ====================== Syntax: {make_nocache $foo} diff --git a/change_log.txt b/change_log.txt index 720ff1af..f0fcdcee 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,9 +1,7 @@  ===== 3.1.30-dev ===== (xx.xx.xx) 20.02.2016 - bugfix {strip} must keep space between hmtl tags. Broken by changes of 10.2.2016 https://github.com/smarty-php/smarty/issues/184 - - new feature/bugfix {foreach}{section} new attribute 'property' to force compilation of loop property - read NEW_FEATURES.txt https://github.com/smarty-php/smarty/issues/189 - + 19.02.2016 - revert output buffer flushing on display, echo content again because possible problems when PHP files had characters (newline} after ?> at file end https://github.com/smarty-php/smarty/issues/187 diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index 72e441c6..6d81d44b 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -121,7 +121,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * smarty version */ - const SMARTY_VERSION = '3.1.30-dev/47'; + const SMARTY_VERSION = '3.1.30-dev/46'; /** * define variable scopes diff --git a/libs/sysplugins/smarty_internal_compile_foreach.php b/libs/sysplugins/smarty_internal_compile_foreach.php index 73eb6874..2ba41bbc 100644 --- a/libs/sysplugins/smarty_internal_compile_foreach.php +++ b/libs/sysplugins/smarty_internal_compile_foreach.php @@ -30,7 +30,7 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo * @var array * @see Smarty_Internal_CompileBase */ - public $optional_attributes = array('name', 'key', 'properties'); + public $optional_attributes = array('name', 'key'); /** * Attribute definition: Overwrites base class. @@ -137,24 +137,6 @@ class Smarty_Internal_Compile_Foreach extends Smarty_Internal_Compile_Private_Fo if (!empty($this->matchResults[ 'named' ])) { $namedAttr = $this->matchResults[ 'named' ]; } - if (isset($_attr[ 'properties' ]) && preg_match_all("/['](.*?)[']/", $_attr[ 'properties' ], $match)) { - foreach ($match[ 1 ] as $prop) { - if (in_array($prop, $this->itemProperties)) { - $itemAttr[ $prop ] = true; - } else { - $compiler->trigger_template_error("Invalid property '{$prop}'", null, true); - } - } - if ($this->isNamed) { - foreach ($match[ 1 ] as $prop) { - if (in_array($prop, $this->nameProperties)) { - $nameAttr[ $prop ] = true; - } else { - $compiler->trigger_template_error("Invalid property '{$prop}'", null, true); - } - } - } - } if (isset($itemAttr[ 'first' ])) { $itemAttr[ 'index' ] = true; } diff --git a/libs/sysplugins/smarty_internal_compile_section.php b/libs/sysplugins/smarty_internal_compile_section.php index c3701fc6..ac3faefe 100644 --- a/libs/sysplugins/smarty_internal_compile_section.php +++ b/libs/sysplugins/smarty_internal_compile_section.php @@ -38,7 +38,7 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo * @var array * @see Smarty_Internal_CompileBase */ - public $optional_attributes = array('start', 'step', 'max', 'show', 'properties'); + public $optional_attributes = array('start', 'step', 'max', 'show'); /** * counter @@ -119,15 +119,6 @@ class Smarty_Internal_Compile_Section extends Smarty_Internal_Compile_Private_Fo if (!empty($this->matchResults[ 'named' ])) { $namedAttr = $this->matchResults[ 'named' ]; } - if (isset($_attr[ 'properties' ]) && preg_match_all("/['](.*?)[']/", $_attr[ 'properties' ], $match)) { - foreach ($match[ 1 ] as $prop) { - if (in_array($prop, $this->nameProperties)) { - $namedAttr[ $prop ] = true; - } else { - $compiler->trigger_template_error("Invalid property '{$prop}'", null, true); - } - } - } $namedAttr[ 'index' ] = true; $output = " $attr_value) {