- bugfix assigning a variable in if condition by function like {if $v…

…alue = array_shift($array)} the function got called twice #291
smarty-php · Sep 15, 2016 · cd28347 · cd28347
1 parent f95b81a
commit cd28347
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
@@ -114,7 +114,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.31-dev/21';
+    const SMARTY_VERSION = '3.1.31-dev/22';
 
     /**
      * define variable scopes

diff --git a/libs/sysplugins/smarty_internal_compile_if.php b/libs/sysplugins/smarty_internal_compile_if.php
@@ -48,20 +48,20 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
                 // create nocache var to make it know for further compiling
                 $compiler->setNocacheInVariable($var);
             }
-            $assignCompiler = new Smarty_Internal_Compile_Assign();
+            $prefixVar = $compiler->getNewPrefixVariable();
+            $_output = "<?php {$prefixVar} = " . $parameter[ 'if condition' ][ 'value' ] . ";?>\n";
             $assignAttr = array();
-            $assignAttr[][ 'value' ] = $parameter[ 'if condition' ][ 'value' ];
+            $assignAttr[][ 'value' ] = "{$prefixVar}";
+            $assignCompiler = new Smarty_Internal_Compile_Assign();
             if (is_array($parameter[ 'if condition' ][ 'var' ])) {
                 $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
-                $_output = $assignCompiler->compile($assignAttr, $compiler,
+                $_output .= $assignCompiler->compile($assignAttr, $compiler,
                                                     array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ]));
             } else {
                 $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ];
-                $_output = $assignCompiler->compile($assignAttr, $compiler, array());
+                $_output .= $assignCompiler->compile($assignAttr, $compiler, array());
             }
-            $_output .= "<?php if (\$_smarty_tpl->tpl_vars[{$var}]->value" .
-                        (isset($parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ]) ?
-                            $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ] : '') . ") {?>";
+            $_output .= "<?php if ({$prefixVar}) {?>";
             return $_output;
         } else {
             return "<?php if ({$parameter['if condition']}) {?>";
@@ -137,16 +137,18 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
                 // create nocache var to make it know for further compiling
                 $compiler->setNocacheInVariable($var);
             }
+            $prefixVar = $compiler->getNewPrefixVariable();
+            $assignCode = "<?php {$prefixVar} = " . $parameter[ 'if condition' ][ 'value' ] . ";?>\n";
             $assignCompiler = new Smarty_Internal_Compile_Assign();
             $assignAttr = array();
-            $assignAttr[][ 'value' ] = $parameter[ 'if condition' ][ 'value' ];
+            $assignAttr[][ 'value' ] = "{$prefixVar}";
             if (is_array($parameter[ 'if condition' ][ 'var' ])) {
                 $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ][ 'var' ];
-                $assignCode = $assignCompiler->compile($assignAttr, $compiler,
+                $assignCode .= $assignCompiler->compile($assignAttr, $compiler,
                                                        array('smarty_internal_index' => $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ]));
             } else {
                 $assignAttr[][ 'var' ] = $parameter[ 'if condition' ][ 'var' ];
-                $assignCode = $assignCompiler->compile($assignAttr, $compiler, array());
+                $assignCode .= $assignCompiler->compile($assignAttr, $compiler, array());
             }
         } else {
             $condition_by_assign = false;
@@ -157,10 +159,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
             if ($condition_by_assign) {
                 $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
                 $_output = $compiler->appendCode("<?php } else {\n?>", $assignCode);
-                return $compiler->appendCode($_output, "<?php if (\$_smarty_tpl->tpl_vars[{$var}]->value" .
-                                                       (isset($parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ]) ?
-                                                           $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ] :
-                                                           '') . ") {?>");
+                return $compiler->appendCode($_output, "<?php if ({$prefixVar}) {?>");
             } else {
                 $this->openTag($compiler, 'elseif', array($nesting, $compiler->tag_nocache));
                 return "<?php } elseif ({$parameter['if condition']}) {?>";
@@ -170,10 +169,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler, $
             $this->openTag($compiler, 'elseif', array($nesting + 1, $compiler->tag_nocache));
             if ($condition_by_assign) {
                 $_output = $compiler->appendCode($_output, $assignCode);
-                return $compiler->appendCode($_output, "<?php if (\$_smarty_tpl->tpl_vars[{$var}]->value" .
-                                                       (isset($parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ]) ?
-                                                           $parameter[ 'if condition' ][ 'var' ][ 'smarty_internal_index' ] :
-                                                           '') . ") {?>");
+                return $compiler->appendCode($_output, "<?php if ({$prefixVar}) {?>");
             } else {
                 return $compiler->appendCode($_output, "<?php if ({$parameter['if condition']}) {?>");
             }