diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-07-14 16:51:46 -0400 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-07-14 16:51:46 -0400 |
| commit | bc6122b64ffb5c13c26991f78346fdc7dee6f9f0 (patch) | |
| tree | 31673423cd6ab751bc8b102c97e89a182a94e219 /phpBB/includes/bbcode.php | |
| parent | 79dd44061bbfeab64dd2ff7b40541612c219c33c (diff) | |
| parent | 1891e24ea6f5b8d5944535479182e70119b2979f (diff) | |
| download | forums-bc6122b64ffb5c13c26991f78346fdc7dee6f9f0.tar forums-bc6122b64ffb5c13c26991f78346fdc7dee6f9f0.tar.gz forums-bc6122b64ffb5c13c26991f78346fdc7dee6f9f0.tar.bz2 forums-bc6122b64ffb5c13c26991f78346fdc7dee6f9f0.tar.xz forums-bc6122b64ffb5c13c26991f78346fdc7dee6f9f0.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index c198abeb54..fd00728510 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -134,11 +134,11 @@ 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(), $phpbb_root_path); - $template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $phpbb_extension_manager); + $template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, new phpbb_template_context(), $phpbb_extension_manager); $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')); - $this->template_filename = $style_resource_locator->get_source_file_for_handle('bbcode.html'); + $this->template_filename = $template->get_source_file_for_handle('bbcode.html'); } $bbcode_ids = $rowset = $sql = array(); |