From 1371f6340204fe16a0199a75f48e048fdc9c2cb2 Mon Sep 17 00:00:00 2001
From: diosmosis <benakamoorthi@fastmail.fm>
Date: Tue, 11 Feb 2014 21:39:13 +0000
Subject: Fixes #4669 do not use newer nextIf method in rendertokenparser.

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

(limited to 'core/View')

diff --git a/core/View/RenderTokenParser.php b/core/View/RenderTokenParser.php
index 520f5630e7..ddb21b9371 100644
--- a/core/View/RenderTokenParser.php
+++ b/core/View/RenderTokenParser.php
@@ -40,8 +40,10 @@ class RenderTokenParser extends Twig_TokenParser
         $view = $parser->getExpressionParser()->parseExpression();
 
         $variablesOverride = new Twig_Node_Expression_Array(array(), $token->getLine());
-        if ($stream->nextIf(Twig_Token::NAME_TYPE, 'with')) {
-            $variablesOverride = $this->parser->getExpressionParser()->parseExpression();
+        if ($stream->test(Twig_Token::NAME_TYPE, 'with')) {
+            $stream->next();
+            
+            $variablesOverride->addElement($this->parser->getExpressionParser()->parseExpression());
         }
 
         $stream->expect(Twig_Token::BLOCK_END_TYPE);
-- 
cgit v1.2.3