aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/template
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-11-02 18:51:35 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2012-11-02 18:51:35 -0400
commit767d09227bd848da21dc3e255b1dacd20cbad1f7 (patch)
tree636a4151aea63f078ad666d4eb3c74baa361efbc /phpBB/includes/template
parentd7a626c70bdfd7aea5e10ec891230cbd2e94f862 (diff)
downloadforums-767d09227bd848da21dc3e255b1dacd20cbad1f7.tar
forums-767d09227bd848da21dc3e255b1dacd20cbad1f7.tar.gz
forums-767d09227bd848da21dc3e255b1dacd20cbad1f7.tar.bz2
forums-767d09227bd848da21dc3e255b1dacd20cbad1f7.tar.xz
forums-767d09227bd848da21dc3e255b1dacd20cbad1f7.zip
[ticket/10933] Dependency inject template context.
PHPBB3-10933
Diffstat (limited to 'phpBB/includes/template')
-rw-r--r--phpBB/includes/template/template.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php
index c89e6ec201..5d3ce4c82b 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/template/template.php
@@ -86,8 +86,9 @@ class phpbb_template
* @param string $phpbb_root_path phpBB root path
* @param user $user current user
* @param phpbb_template_locator $locator template locator
+ * @param phpbb_template_context $context template context
*/
- public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_locator $locator)
+ public function __construct($phpbb_root_path, $php_ext, $config, $user, phpbb_template_locator $locator, phpbb_template_context $context)
{
$this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext;
@@ -95,7 +96,7 @@ class phpbb_template
$this->user = $user;
$this->locator = $locator;
$this->template_path = $this->locator->template_path;
- $this->context = new phpbb_template_context();
+ $this->context = $context;
}
/**