mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/15178' into ticket/15179

Browse Source
This commit is contained in:
Marc Alexander
2017-05-31 20:20:43 +02:00
parent f63f9693d8 e3ec1440ef
commit a079c5fed0
4 changed files with 209 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/phpbb/template/twig/lexer.php
View File

@@ -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));
}
/**

2
phpBB/phpbb/template/twig/loader.php
View File

@@ -35,7 +35,7 @@ class loader extends \Twig_Loader_Filesystem
{
$this->filesystem = $filesystem;
parent::__construct($paths);
parent::__construct($paths, $this->filesystem->realpath(dirname(__FILE__)));
}
/**