diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-06-10 11:17:11 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-06-10 11:17:11 -0500 |
| commit | 15114067e6c88e4ec8fa9d1ff66fd0de28b1144f (patch) | |
| tree | a6aaf6afb52c67c984329f472b9f0e321a99ed24 /phpBB/includes/template/twig/extension.php | |
| parent | b775f67128c1c851a2e3343b230d2861e5431528 (diff) | |
| download | forums-15114067e6c88e4ec8fa9d1ff66fd0de28b1144f.tar forums-15114067e6c88e4ec8fa9d1ff66fd0de28b1144f.tar.gz forums-15114067e6c88e4ec8fa9d1ff66fd0de28b1144f.tar.bz2 forums-15114067e6c88e4ec8fa9d1ff66fd0de28b1144f.tar.xz forums-15114067e6c88e4ec8fa9d1ff66fd0de28b1144f.zip | |
[feature/twig] Replace phpBB template code with Twig syntax, then parse w/Twig
Fixing begin token/node, adding includejs token/node
PHPBB3-11598
Diffstat (limited to 'phpBB/includes/template/twig/extension.php')
| -rw-r--r-- | phpBB/includes/template/twig/extension.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php index a607bac150..c121a21800 100644 --- a/phpBB/includes/template/twig/extension.php +++ b/phpBB/includes/template/twig/extension.php @@ -26,10 +26,11 @@ class phpbb_template_twig_extension extends Twig_Extension { return array( new phpbb_template_twig_tokenparser_if, - new phpbb_template_twig_tokenparser_include, - new phpbb_template_twig_tokenparser_event, new phpbb_template_twig_tokenparser_begin, new phpbb_template_twig_tokenparser_define, + new phpbb_template_twig_tokenparser_include, + new phpbb_template_twig_tokenparser_includejs, + new phpbb_template_twig_tokenparser_event, ); } @@ -39,7 +40,6 @@ class phpbb_template_twig_extension extends Twig_Extension array(), array( 'eq' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), - //'and' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), '!==' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT), ), ); |