diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-13 10:58:03 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-13 10:58:03 -0500 |
| commit | b4a374dc73eda55db1c67b87bd65a73f79411ef5 (patch) | |
| tree | ae392771a6aad76517e46b17c26797037c036a61 /phpBB/phpbb/template/twig/environment.php | |
| parent | 21624e79fc512fd86177080010bb7d26c71ce3cb (diff) | |
| download | forums-b4a374dc73eda55db1c67b87bd65a73f79411ef5.tar forums-b4a374dc73eda55db1c67b87bd65a73f79411ef5.tar.gz forums-b4a374dc73eda55db1c67b87bd65a73f79411ef5.tar.bz2 forums-b4a374dc73eda55db1c67b87bd65a73f79411ef5.tar.xz forums-b4a374dc73eda55db1c67b87bd65a73f79411ef5.zip | |
[ticket/11832] Fix INCLUDE(JS/CSS)
PHPBB3-11832
Diffstat (limited to 'phpBB/phpbb/template/twig/environment.php')
| -rw-r--r-- | phpBB/phpbb/template/twig/environment.php | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/phpBB/phpbb/template/twig/environment.php b/phpBB/phpbb/template/twig/environment.php index 9a40dc2b15..612519db69 100644 --- a/phpBB/phpbb/template/twig/environment.php +++ b/phpBB/phpbb/template/twig/environment.php @@ -23,9 +23,15 @@ class phpbb_template_twig_environment extends Twig_Environment /** @var phpbb_config */ protected $phpbb_config; + /** @var phpbb_filesystem */ + protected $phpbb_filesystem; + /** @var string */ protected $phpbb_root_path; + /** @var string */ + protected $web_root_path; + /** @var array **/ protected $namespace_look_up_order = array('__main__'); @@ -38,11 +44,14 @@ class phpbb_template_twig_environment extends Twig_Environment * @param Twig_LoaderInterface $loader * @param array $options Array of options to pass to Twig */ - public function __construct($phpbb_config, $phpbb_extensions, $phpbb_root_path, Twig_LoaderInterface $loader = null, $options = array()) + public function __construct($phpbb_config, $phpbb_extensions, phpbb_filesystem $phpbb_filesystem, Twig_LoaderInterface $loader = null, $options = array()) { $this->phpbb_config = $phpbb_config; $this->phpbb_extensions = $phpbb_extensions; - $this->phpbb_root_path = $phpbb_root_path; + + $this->phpbb_filesystem = $phpbb_filesystem; + $this->phpbb_root_path = $this->phpbb_filesystem->get_phpbb_root_path(); + $this->web_root_path = $this->phpbb_filesystem->get_web_root_path(); return parent::__construct($loader, $options); } @@ -80,6 +89,26 @@ class phpbb_template_twig_environment extends Twig_Environment } /** + * Get the web root path + * + * @return string + */ + public function get_web_root_path() + { + return $this->web_root_path; + } + + /** + * Get the phpbb_filesystem object + * + * @return phpbb_filesystem + */ + public function get_filesystem() + { + return $this->phpbb_filesystem; + } + + /** * Get the namespace look up order * * @return array |