diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2016-11-16 21:39:29 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-11-16 21:39:29 +0100 |
| commit | a96fc3d87fdb6558397debd26992877677816d34 (patch) | |
| tree | b65faed728d467a5a160b001fab44839ab9b266c /phpBB/phpbb/template/twig/lexer.php | |
| parent | Merge pull request #4501 from marc1706/ticket/14716 (diff) | |
| download | phpbb-a96fc3d87fdb6558397debd26992877677816d34.tar.gz phpbb-a96fc3d87fdb6558397debd26992877677816d34.tar.bz2 phpbb-a96fc3d87fdb6558397debd26992877677816d34.zip | |
[ticket/14867] Revert back to twig 1.26.* and update dependencies
The revert of twig back to 1.26.* is necessary due to a breaking
change in the way the Filesystem loader returns the paths to
template files.
PHPBB3-14867
Diffstat (limited to 'phpBB/phpbb/template/twig/lexer.php')
| -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); } /** |