* [Bots/Scripting] Fixed an issue in bot behavior scripts where tempo…

…rary variables could overwrite placeholders of the same name. Fixes #842
jstanden · Dec 29, 2018 · 79d0122 · 79d0122
1 parent 2a46839
commit 79d0122
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/libs/devblocks/api/services/template_builder.php b/libs/devblocks/api/services/template_builder.php
@@ -497,11 +497,7 @@ public function exists($name) {
 		return isset($this->_dictionary[$name]);
 	}
 
-	public function delegateUndefinedVariable($name, &$context) {
-		$this->$name;
-
-		$context = array_merge($context, $this->_dictionary);
-
+	public function delegateUndefinedVariable($name) {
 		return $this->get($name);
 	}
 

diff --git a/libs/devblocks/libs/Twig/Environment.php b/libs/devblocks/libs/Twig/Environment.php
@@ -1168,10 +1168,10 @@ public function getUndefinedVariableCallbacks() {
 		 * @param string $name The undefined variable
 		 * @return mixed
 		 */
-		public function getUndefinedVariable($name, &$context)
+		public function getUndefinedVariable($name)
 		{
 				foreach ($this->variableCallbacks as $callback) {
-					if(false !== ($value = $callback($name, $context)))
+					if(false !== ($value = $callback($name)))
 						return $value;
 				}
 

diff --git a/libs/devblocks/libs/Twig/Node/Expression/Name.php b/libs/devblocks/libs/Twig/Node/Expression/Name.php
@@ -32,7 +32,18 @@ public function compile(Twig_Compiler $compiler)
             if ($this->isSpecial()) {
                 $compiler->repr(true);
             } else {
-                $compiler->raw('array_key_exists(')->repr($name)->raw(', $context)');
+                $compiler
+                    ->raw('(')
+                    ->raw('array_key_exists(')
+                    ->repr($name)
+                    ->raw(', $context)')
+                    ->raw(' || ')
+                    ->raw('!is_null(')
+                    ->raw('$this->env->getUndefinedVariable(')
+                    ->repr($name)
+                    ->raw('))')
+                    ->raw(')')
+                ;
             }
         } elseif ($this->isSpecial()) {
             $compiler->raw($this->specialVars[$name]);
@@ -56,7 +67,7 @@ public function compile(Twig_Compiler $compiler)
                         //->raw('null)')
                         ->raw('$this->env->getUndefinedVariable(')
                         ->string($name)
-                        ->raw(', $context))')
+                        ->raw('))')
                     ;
                 } else {
                     $compiler->raw('$this->getContext($context, ')->string($name)->raw('))');
@@ -76,7 +87,7 @@ public function compile(Twig_Compiler $compiler)
                         //->raw('null)')
                         ->raw('$this->env->getUndefinedVariable(')
                         ->string($name)
-                        ->raw(', $context))')
+                        ->raw('))')
                     ;
                 } else {
                     $compiler->raw('$this->getContext($context, ')->string($name)->raw('))');

diff --git a/libs/devblocks/libs/Twig/Node/SetTemp.php b/libs/devblocks/libs/Twig/Node/SetTemp.php
@@ -32,7 +32,7 @@ public function compile(Twig_Compiler $compiler)
             //->raw("_ = null; }\n")
             ->raw("_ = \$this->env->getUndefinedVariable('")
             ->raw($name)
-            ->raw("', \$context); }\n")
+            ->raw("'); }\n")
         ;
     }
 }