diff options
author | diosmosis <benakamoorthi@fastmail.fm> | 2014-02-09 13:02:58 +0400 |
---|---|---|
committer | diosmosis <benakamoorthi@fastmail.fm> | 2014-02-09 13:02:58 +0400 |
commit | 5c0b87c63238425fc2334589e012bb8a877b0666 (patch) | |
tree | ff89ab43b6e84cb4e1d630b012bb66f4824d0e45 /core/View | |
parent | a1f469175f50e755115036df56420f46abf16f75 (diff) |
Fix bug in RenderTokenParser (getTemplateVars argument node created incorrectly).
Diffstat (limited to 'core/View')
-rw-r--r-- | core/View/RenderTokenParser.php | 5 |
1 files changed, 2 insertions, 3 deletions
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() ); |