diff options
| author | diosmosis <benakamoorthi@fastmail.fm> | 2014-02-12 02:48:33 +0400 |
|---|---|---|
| committer | diosmosis <benakamoorthi@fastmail.fm> | 2014-02-12 02:48:33 +0400 |
| commit | f95bb763f4c33ca3767139a7bf8ca14ba05606e1 (patch) | |
| tree | 0029ec8b5811a8c7068f14847c905ba91f582c74 /core/View | |
| parent | 78ff5b6c51b5e6e9592b8d9fcb4dc32d208343d2 (diff) | |
| parent | 1371f6340204fe16a0199a75f48e048fdc9c2cb2 (diff) | |
Merge branch 'master' into customdash
Conflicts:
core/View/RenderTokenParser.php
Diffstat (limited to 'core/View')
| -rw-r--r-- | core/View/RenderTokenParser.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/View/RenderTokenParser.php b/core/View/RenderTokenParser.php index 73e7a7a9f2..ddb21b9371 100644 --- a/core/View/RenderTokenParser.php +++ b/core/View/RenderTokenParser.php @@ -40,7 +40,9 @@ 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')) { + if ($stream->test(Twig_Token::NAME_TYPE, 'with')) { + $stream->next(); + $variablesOverride->addElement($this->parser->getExpressionParser()->parseExpression()); } |