diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-08-03 01:09:37 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-08-04 21:23:06 -0400 |
| commit | 13536f2be5e9c26752a6c9c5db19892b3c8e5490 (patch) | |
| tree | 353a67eba73c7bc7052af6ec546ed85374127fe9 /phpBB/includes/template | |
| parent | 05b71ca04e8584428d335512a199e8c71c53a74f (diff) | |
| download | forums-13536f2be5e9c26752a6c9c5db19892b3c8e5490.tar forums-13536f2be5e9c26752a6c9c5db19892b3c8e5490.tar.gz forums-13536f2be5e9c26752a6c9c5db19892b3c8e5490.tar.bz2 forums-13536f2be5e9c26752a6c9c5db19892b3c8e5490.tar.xz forums-13536f2be5e9c26752a6c9c5db19892b3c8e5490.zip | |
[feature/template-engine] Add constructor to template locator.
PHPBB3-9726
Diffstat (limited to 'phpBB/includes/template')
| -rw-r--r-- | phpBB/includes/template/locator.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/template/template.php | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/includes/template/locator.php b/phpBB/includes/template/locator.php index 961783e635..7d0b618be3 100644 --- a/phpBB/includes/template/locator.php +++ b/phpBB/includes/template/locator.php @@ -60,6 +60,14 @@ class phpbb_template_locator private $orig_tpl_inherits_id; + private $user; + + public function __construct($phpbb_root_path, $user) + { + $this->phpbb_root_path = $phpbb_root_path; + $this->user = $user; + } + /** * Set template location. * @param string $style_name Name of style from which templates are to be taken diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php index 4ac15ae500..2f360e4df4 100644 --- a/phpBB/includes/template/template.php +++ b/phpBB/includes/template/template.php @@ -81,7 +81,7 @@ class phpbb_template $this->phpEx = $phpEx; $this->config = $config; $this->user = $user; - $this->locator = new phpbb_template_locator(); + $this->locator = new phpbb_template_locator($phpbb_root_path, $user); } /** |