diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-11-03 00:34:51 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-11-03 00:34:51 +0100 |
| commit | 816c546666b9ee27a717efc4f5640afc4794cff6 (patch) | |
| tree | fede01e679bf9084910a379310f4adad8a505e94 /phpBB/includes/bbcode.php | |
| parent | 000bbfd5b342627b103d7c460864d4dad0dc8134 (diff) | |
| parent | c063e3a52cb561e44368cbd854973f51f4b4b304 (diff) | |
| download | forums-816c546666b9ee27a717efc4f5640afc4794cff6.tar forums-816c546666b9ee27a717efc4f5640afc4794cff6.tar.gz forums-816c546666b9ee27a717efc4f5640afc4794cff6.tar.bz2 forums-816c546666b9ee27a717efc4f5640afc4794cff6.tar.xz forums-816c546666b9ee27a717efc4f5640afc4794cff6.zip | |
Merge remote-tracking branch 'p/ticket/10933-lite' into develop
* p/ticket/10933-lite:
[ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.
[ticket/10933] Dependency inject template context.
[ticket/10933] Expanded prose documentation for phpbb_extension_provider.
[ticket/10933] Specify empty template path for absolute includephp test.
[ticket/10933] Useful documentation for template locate function
[ticket/10933] Typo fixes
[ticket/10933] Initialize template context when template is constructed.
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 444446e9c3..b9ffa8091c 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -134,7 +134,7 @@ class bbcode $style_resource_locator = new phpbb_style_resource_locator(); $style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider()); - $template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator); + $template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context()); $style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $template); $style->set_style(); $template->set_filenames(array('bbcode.html' => 'bbcode.html')); |