mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2859 from Nicofuma/ticket/12957

Browse Source 
[ticket/12957] Update the constructions of the template engine
This commit is contained in:
Marc Alexander
2014-08-10 10:23:28 +02:00
parent ab2878b37b 143c1ba8d1
commit 3450b793e7
5 changed files with 66 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/phpbb/template/twig/environment.php
View File

@@ -13,9 +13,6 @@
namespace phpbb\template\twig;
use Twig_Lexer;
use Twig_LexerInterface;
class environment extends \Twig_Environment
{
/** @var \phpbb\config\config */
@@ -79,6 +76,7 @@ class environment extends \Twig_Environment
if (null === $this->lexer)
{
$this->lexer = $this->container->get('template.twig.lexer');
$this->lexer->set_environment($this);
}
return $this->lexer;

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

@@ -15,6 +15,11 @@ namespace phpbb\template\twig;
class lexer extends \Twig_Lexer
{
public function set_environment(\Twig_Environment $env)
{
$this->env = $env;
}
public function tokenize($code, $filename = null)
{
// Our phpBB tags