diff options
| author | David King <imkingdavid@gmail.com> | 2013-08-31 13:37:11 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-08-31 13:37:11 -0700 |
| commit | af1eb7466f11cdb0f851acfcacd957267e20e3ce (patch) | |
| tree | 1c72f7436ffcaa0d355ee11a0375323dcf5731f6 /phpBB/includes/bbcode.php | |
| parent | 9485eea0987478da25327a06a4fd36943ca1c01c (diff) | |
| parent | 9d6370751f1b998e3da448e16c1446b33ddd17d0 (diff) | |
| download | forums-af1eb7466f11cdb0f851acfcacd957267e20e3ce.tar forums-af1eb7466f11cdb0f851acfcacd957267e20e3ce.tar.gz forums-af1eb7466f11cdb0f851acfcacd957267e20e3ce.tar.bz2 forums-af1eb7466f11cdb0f851acfcacd957267e20e3ce.tar.xz forums-af1eb7466f11cdb0f851acfcacd957267e20e3ce.zip | |
Merge branch 'develop' into ticket/11215
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index fd00728510..2fa6a8b099 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -132,11 +132,8 @@ class bbcode { $this->template_bitfield = new bitfield($user->style['bbcode_bitfield']); - $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_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_style(); $template->set_filenames(array('bbcode.html' => 'bbcode.html')); $this->template_filename = $template->get_source_file_for_handle('bbcode.html'); } |