makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'vsephpbb/ticket/12100' into develop

Browse source
This commit is contained in:
Joas Schilling 2014-02-02 14:48:14 +01:00
commit cb04252fbd
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
phpBB/phpbb/template/twig/environment.php
View file

@ -11,15 +11,15 @@ namespace phpbb\template\twig;
class environment extends \Twig_Environment class environment extends \Twig_Environment
{ {
/** @var array */
protected $phpbb_extensions;
/** @var \phpbb\config\config */ /** @var \phpbb\config\config */
protected $phpbb_config; protected $phpbb_config;
/** @var \phpbb\path_helper */ /** @var \phpbb\path_helper */
protected $phpbb_path_helper; protected $phpbb_path_helper;
/** @var \phpbb\extension\manager */
protected $extension_manager;
/** @var string */ /** @var string */
protected $phpbb_root_path; protected $phpbb_root_path;
@ -33,18 +33,19 @@ class environment extends \Twig_Environment
* Constructor * Constructor
* *
* @param \phpbb\config\config $phpbb_config * @param \phpbb\config\config $phpbb_config
* @param array $phpbb_extensions Array of enabled extensions (name => path)
* @param \phpbb\path_helper * @param \phpbb\path_helper
* @param \phpbb\extension\manager
* @param string $phpbb_root_path * @param string $phpbb_root_path
* @param Twig_LoaderInterface $loader * @param Twig_LoaderInterface $loader
* @param array $options Array of options to pass to Twig * @param array $options Array of options to pass to Twig
*/ */
public function __construct($phpbb_config, $phpbb_extensions, \phpbb\path_helper $path_helper, \Twig_LoaderInterface $loader = null, $options = array()) public function __construct($phpbb_config, \phpbb\path_helper $path_helper, \phpbb\extension\manager $extension_manager = null, \Twig_LoaderInterface $loader = null, $options = array())
{ {
$this->phpbb_config = $phpbb_config; $this->phpbb_config = $phpbb_config;
$this->phpbb_extensions = $phpbb_extensions;
$this->phpbb_path_helper = $path_helper; $this->phpbb_path_helper = $path_helper;
$this->extension_manager = $extension_manager;
$this->phpbb_root_path = $this->phpbb_path_helper->get_phpbb_root_path(); $this->phpbb_root_path = $this->phpbb_path_helper->get_phpbb_root_path();
$this->web_root_path = $this->phpbb_path_helper->get_web_root_path(); $this->web_root_path = $this->phpbb_path_helper->get_web_root_path();
@ -60,7 +61,7 @@ class environment extends \Twig_Environment
*/ */
public function get_phpbb_extensions() public function get_phpbb_extensions()
{ {
return $this->phpbb_extensions; return ($this->extension_manager) ? $this->extension_manager->all_enabled() : array();
} }
/** /**

2
phpBB/phpbb/template/twig/twig.php
View file

@ -94,8 +94,8 @@ class twig extends \phpbb\template\base
$this->twig = new \phpbb\template\twig\environment( $this->twig = new \phpbb\template\twig\environment(
$this->config, $this->config,
($this->extension_manager) ? $this->extension_manager->all_enabled() : array(),
$this->path_helper, $this->path_helper,
$this->extension_manager,
$loader, $loader,
array( array(
'cache' => (defined('IN_INSTALL')) ? false : $this->cachepath, 'cache' => (defined('IN_INSTALL')) ? false : $this->cachepath,