diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-06-14 09:41:02 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-06-14 09:41:02 -0500 |
| commit | 9eb3ad4d90d2462d7fb8dfecd73c7611c4780243 (patch) | |
| tree | e5b89aebe53e4d782d3a023b0f3306fa830a2c10 /phpBB/includes/template | |
| parent | 1ad10a77999048c8a2a48ff82d79d18c0401b2dd (diff) | |
| download | forums-9eb3ad4d90d2462d7fb8dfecd73c7611c4780243.tar forums-9eb3ad4d90d2462d7fb8dfecd73c7611c4780243.tar.gz forums-9eb3ad4d90d2462d7fb8dfecd73c7611c4780243.tar.bz2 forums-9eb3ad4d90d2462d7fb8dfecd73c7611c4780243.tar.xz forums-9eb3ad4d90d2462d7fb8dfecd73c7611c4780243.zip | |
[feature/twig] Add && and || support
PHPBB3-11598
Diffstat (limited to 'phpBB/includes/template')
| -rw-r--r-- | phpBB/includes/template/twig/extension.php | 3 |
1 files changed, 3 insertions, 0 deletions
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), ), ); } |