diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-11-24 14:18:41 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-11-24 14:18:41 +0100 |
| commit | 145ba85d981f6bb3b6ebba74bcefb879da62d932 (patch) | |
| tree | b4cc6bf676fc5496792c66f79041da52cb286350 /phpBB/phpbb | |
| parent | 3e1f9c42011951d0bced701dbb0daeed9bf2121d (diff) | |
| parent | a96fc3d87fdb6558397debd26992877677816d34 (diff) | |
| download | forums-145ba85d981f6bb3b6ebba74bcefb879da62d932.tar forums-145ba85d981f6bb3b6ebba74bcefb879da62d932.tar.gz forums-145ba85d981f6bb3b6ebba74bcefb879da62d932.tar.bz2 forums-145ba85d981f6bb3b6ebba74bcefb879da62d932.tar.xz forums-145ba85d981f6bb3b6ebba74bcefb879da62d932.zip | |
Merge pull request #4516 from marc1706/ticket/14867
[ticket/14867] Revert back to twig 1.26.* and update dependencies
* marc1706/ticket/14867:
[ticket/14867] Revert back to twig 1.26.* and update dependencies
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/template/twig/lexer.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/phpBB/phpbb/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php index de03aec04b..f1542109a4 100644 --- a/phpBB/phpbb/template/twig/lexer.php +++ b/phpBB/phpbb/template/twig/lexer.php @@ -22,11 +22,6 @@ class lexer extends \Twig_Lexer public function tokenize($code, $filename = null) { - if ($code instanceof \Twig_Source) - { - $filename = $code->getName(); - $code = $code->getCode(); - } // Our phpBB tags // Commented out tokens are handled separately from the main replace $phpbb_tags = array( @@ -130,7 +125,7 @@ class lexer extends \Twig_Lexer // Appends any filters $code = preg_replace('#{([a-zA-Z0-9_\.]+)(\|[^}]+?)?}#', '{{ $1$2 }}', $code); - return parent::tokenize(new \Twig_Source($code, $filename)); + return parent::tokenize($code, $filename); } /** |