diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-31 18:10:00 +0300 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-31 18:10:00 +0300 |
| commit | 17989c17a040a28aeeefcf55f6cca054b28c06ed (patch) | |
| tree | c774bb4f60dba6973fcb095cc27768428ff71cc5 /phpBB/includes/bbcode.php | |
| parent | 0540509f145d7eb9ba1fd4468399b48edcf46d23 (diff) | |
| download | forums-17989c17a040a28aeeefcf55f6cca054b28c06ed.tar forums-17989c17a040a28aeeefcf55f6cca054b28c06ed.tar.gz forums-17989c17a040a28aeeefcf55f6cca054b28c06ed.tar.bz2 forums-17989c17a040a28aeeefcf55f6cca054b28c06ed.tar.xz forums-17989c17a040a28aeeefcf55f6cca054b28c06ed.zip | |
[feature/merging-style-components] Moving template initialization out of style
Moving template initialization out of style constructor
PHPBB3-10632
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 2cae38022e..612ced8ad6 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -134,9 +134,9 @@ 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()); - $style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider); + $template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider); + $style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider, $template); $style->set_style(); - $template = $style->template; $template->set_filenames(array('bbcode.html' => 'bbcode.html')); $this->template_filename = $style_resource_locator->get_source_file_for_handle('bbcode.html'); } |