mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-21 08:00:46 +01:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander 2017-06-11 19:09:02 +02:00
commit a44f31ec42
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
5 changed files with 394 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/composer.json
View File

@ -48,7 +48,7 @@
"symfony/routing": "~3.1",
"symfony/twig-bridge": "~3.1",
"symfony/yaml": "~3.1",
"twig/twig": "^1.0,<1.25"
"twig/twig": "^1.0"
},
"require-dev": {
"fabpot/goutte": "~3.1",

664
phpBB/composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
phpBB/phpbb/console/command/update/check.php
View File

@ -325,7 +325,7 @@ class check extends \phpbb\console\command\command
$io->table([
$this->language->lang('VERSION'),
$this->language->lang('ANNOUNCEMENT_TOPIC'),
$this->language->lang('DOWNLOAD_LATEST'),
$this->language->lang('DOWNLOAD_LATEST'),
], $rows);
}
}

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