diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-12-30 11:36:08 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-05-09 21:40:06 +0200 |
| commit | ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32 (patch) | |
| tree | a6f45f42c8861ba60216517687bfe72084ba7dcb /phpBB/phpbb | |
| parent | d968392b4d4aa45afc7fbe75e0ad0a1d06e9275e (diff) | |
| download | forums-ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32.tar forums-ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32.tar.gz forums-ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32.tar.bz2 forums-ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32.tar.xz forums-ebac54aa9e705e99a562d2fe2c0f57bc6af8dd32.zip | |
[ticket/14948] Adjust calls for twig and phpunit updates
PHPBB3-14948
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/cache/driver/memory.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/tokenparser/defineparser.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/cache/driver/memory.php b/phpBB/phpbb/cache/driver/memory.php index eba9549877..956936bf6f 100644 --- a/phpBB/phpbb/cache/driver/memory.php +++ b/phpBB/phpbb/cache/driver/memory.php @@ -25,7 +25,7 @@ abstract class memory extends \phpbb\cache\driver\base */ function __construct() { - global $phpbb_root_path, $dbname, $table_prefix, $phpbb_container; + global $dbname, $table_prefix, $phpbb_container; $this->cache_dir = $phpbb_container->getParameter('core.cache_dir'); $this->key_prefix = substr(md5($dbname . $table_prefix), 0, 8) . '_'; diff --git a/phpBB/phpbb/template/twig/tokenparser/defineparser.php b/phpBB/phpbb/template/twig/tokenparser/defineparser.php index 2137b145b7..6285091e94 100644 --- a/phpBB/phpbb/template/twig/tokenparser/defineparser.php +++ b/phpBB/phpbb/template/twig/tokenparser/defineparser.php @@ -41,7 +41,7 @@ class defineparser extends \Twig_TokenParser { // This would happen if someone improperly formed their DEFINE syntax // e.g. <!-- DEFINE $VAR = foo --> - throw new \Twig_Error_Syntax('Invalid DEFINE', $token->getLine(), $this->parser->getFilename()); + throw new \Twig_Error_Syntax('Invalid DEFINE', $token->getLine(), $this->parser->getStream()->getSourceContext()->getPath()); } $stream->expect(\Twig_Token::BLOCK_END_TYPE); |