aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-06-25 18:06:45 -0500
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-06-25 18:06:45 -0500
commit3766b736da96cfbed3a234235f977f8f56c60632 (patch)
treedde9c580e7d2501d50b0370f1db9a2108fd1df1e
parent1c8c03c4dbd74f2f2abf6d2968bc33a234df5a4e (diff)
downloadforums-3766b736da96cfbed3a234235f977f8f56c60632.tar
forums-3766b736da96cfbed3a234235f977f8f56c60632.tar.gz
forums-3766b736da96cfbed3a234235f977f8f56c60632.tar.bz2
forums-3766b736da96cfbed3a234235f977f8f56c60632.tar.xz
forums-3766b736da96cfbed3a234235f977f8f56c60632.zip
[feature/twig] Don't require phpbb_config, some tests pass null
PHPBB3-11598
-rw-r--r--phpBB/includes/template/twig/environment.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/template/twig/environment.php b/phpBB/includes/template/twig/environment.php
index 5032df9483..0947a902d0 100644
--- a/phpBB/includes/template/twig/environment.php
+++ b/phpBB/includes/template/twig/environment.php
@@ -29,7 +29,7 @@ class phpbb_template_twig_environment extends Twig_Environment
/** @var array **/
protected $namespaceLookUpOrder = array('__main__');
- public function __construct(phpbb_config $phpbb_config, $phpbb_extensions, $phpbb_root_path, Twig_LoaderInterface $loader = null, $options = array())
+ public function __construct($phpbb_config, $phpbb_extensions, $phpbb_root_path, Twig_LoaderInterface $loader = null, $options = array())
{
$this->phpbb_config = $phpbb_config;
$this->phpbb_extensions = $phpbb_extensions;