From 5c0b87c63238425fc2334589e012bb8a877b0666 Mon Sep 17 00:00:00 2001
From: diosmosis <benakamoorthi@fastmail.fm>
Date: Sun, 9 Feb 2014 09:02:58 +0000
Subject: Fix bug in RenderTokenParser (getTemplateVars  argument node created
 incorrectly).

---
 core/View/RenderTokenParser.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'core/View')

diff --git a/core/View/RenderTokenParser.php b/core/View/RenderTokenParser.php
index 14f1eb6806..520f5630e7 100644
--- a/core/View/RenderTokenParser.php
+++ b/core/View/RenderTokenParser.php
@@ -39,7 +39,7 @@ class RenderTokenParser extends Twig_TokenParser
 
         $view = $parser->getExpressionParser()->parseExpression();
 
-        $variablesOverride = null;
+        $variablesOverride = new Twig_Node_Expression_Array(array(), $token->getLine());
         if ($stream->nextIf(Twig_Token::NAME_TYPE, 'with')) {
             $variablesOverride = $this->parser->getExpressionParser()->parseExpression();
         }
@@ -53,11 +53,10 @@ class RenderTokenParser extends Twig_TokenParser
             $token->getLine()
         );
 
-        $variablesOverrideExpr = $variablesOverride === null ? array() : array($variablesOverride);
         $variablesExpr = new Twig_Node_Expression_MethodCall(
             $view,
             'getTemplateVars',
-            new Twig_Node_Expression_Array($variablesOverrideExpr, $token->getLine()),
+            $variablesOverride,
             $token->getLine()
         );
 
-- 
cgit v1.2.3