Merge branch '3.3.x'

2025-08-23 16:52:54 +02:00 · 2020-01-18 14:34:37 +01:00
parent a6cd4df423 ebd9d0fe25
commit 765f2cfb5f
2 changed files with 6 additions and 4 deletions
--- a/phpBB/phpbb/template/twig/lexer.php
+++ b/phpBB/phpbb/template/twig/lexer.php
@@ -72,6 +72,8 @@ class lexer extends \Twig_Lexer
 			'endspaceless',
 			'verbatim',
 			'endverbatim',
+			'apply',
+			'endapply',
 		);

 		// Fix tokens that may have inline variables (e.g. <!-- DEFINE $TEST = '{FOO}')