Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/core/View
diff options
context:
space:
mode:
authordiosmosis <benakamoorthi@fastmail.fm>2014-02-12 01:39:13 +0400
committerdiosmosis <benakamoorthi@fastmail.fm>2014-02-12 01:39:13 +0400
commit1371f6340204fe16a0199a75f48e048fdc9c2cb2 (patch)
tree06634f62bd578085166466e8ff1729dee7e93f6e /core/View
parent58c0af22191ec2392d52c9fdf1212b4f68bc4b4c (diff)
Fixes #4669 do not use newer nextIf method in rendertokenparser.
Diffstat (limited to 'core/View')
-rw-r--r--core/View/RenderTokenParser.php6
1 files changed, 4 insertions, 2 deletions
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);