From 9eb3ad4d90d2462d7fb8dfecd73c7611c4780243 Mon Sep 17 00:00:00 2001 From: Nathaniel Guse Date: Fri, 14 Jun 2013 09:41:02 -0500 Subject: [PATCH] [feature/twig] Add && and || support PHPBB3-11598 --- phpBB/includes/template/twig/extension.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php index 718909ee50..ff37a38c29 100644 --- a/phpBB/includes/template/twig/extension.php +++ b/phpBB/includes/template/twig/extension.php @@ -53,6 +53,9 @@ class phpbb_template_twig_extension extends Twig_Extension 'gte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), 'lt' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Less', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), 'lte' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), + + '||' => array('precedence' => 10, 'class' => 'Twig_Node_Expression_Binary_Or', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), + '&&' => array('precedence' => 15, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), ), ); }