diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-05-31 20:20:43 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-05-31 20:20:43 +0200 |
| commit | a079c5fed0513ddd9e66d89391067312812ab3b2 (patch) | |
| tree | 01ba919bc7b970a4201aa60fad8b9fc7f3c2ed07 /phpBB/phpbb | |
| parent | f63f9693d8d305f5683ce4d9592832d801fedd7d (diff) | |
| parent | e3ec1440ef361e12dc4a77003aeb18f076d80653 (diff) | |
| download | forums-a079c5fed0513ddd9e66d89391067312812ab3b2.tar forums-a079c5fed0513ddd9e66d89391067312812ab3b2.tar.gz forums-a079c5fed0513ddd9e66d89391067312812ab3b2.tar.bz2 forums-a079c5fed0513ddd9e66d89391067312812ab3b2.tar.xz forums-a079c5fed0513ddd9e66d89391067312812ab3b2.zip | |
Merge branch 'ticket/15178' into ticket/15179
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/template/twig/lexer.php | 11 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/loader.php | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/phpBB/phpbb/template/twig/lexer.php b/phpBB/phpbb/template/twig/lexer.php index f1542109a4..d0bcfa615e 100644 --- a/phpBB/phpbb/template/twig/lexer.php +++ b/phpBB/phpbb/template/twig/lexer.php @@ -22,6 +22,14 @@ class lexer extends \Twig_Lexer public function tokenize($code, $filename = null) { + // Handle \Twig_Source format input + if ($code instanceof \Twig_Source) + { + $source = $code; + $code = $source->getCode(); + $filename = $source->getName(); + } + // Our phpBB tags // Commented out tokens are handled separately from the main replace $phpbb_tags = array( @@ -125,7 +133,8 @@ class lexer extends \Twig_Lexer // Appends any filters $code = preg_replace('#{([a-zA-Z0-9_\.]+)(\|[^}]+?)?}#', '{{ $1$2 }}', $code); - return parent::tokenize($code, $filename); + // Tokenize \Twig_Source instance + return parent::tokenize(new \Twig_Source($code, $filename)); } /** diff --git a/phpBB/phpbb/template/twig/loader.php b/phpBB/phpbb/template/twig/loader.php index d2b42852ce..c13e3ee298 100644 --- a/phpBB/phpbb/template/twig/loader.php +++ b/phpBB/phpbb/template/twig/loader.php @@ -35,7 +35,7 @@ class loader extends \Twig_Loader_Filesystem { $this->filesystem = $filesystem; - parent::__construct($paths); + parent::__construct($paths, $this->filesystem->realpath(dirname(__FILE__))); } /** |