diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-31 17:38:30 +0300 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-31 17:38:30 +0300 |
| commit | 360312f599edd852e14fcd162552e19dd2d278a6 (patch) | |
| tree | 89202a7ba57cd9c469b2d21fd4d6c432b410dfb7 /phpBB/includes/bbcode.php | |
| parent | 961199755200668790b243447eac6bf3374b0bb6 (diff) | |
| download | forums-360312f599edd852e14fcd162552e19dd2d278a6.tar forums-360312f599edd852e14fcd162552e19dd2d278a6.tar.gz forums-360312f599edd852e14fcd162552e19dd2d278a6.tar.bz2 forums-360312f599edd852e14fcd162552e19dd2d278a6.tar.xz forums-360312f599edd852e14fcd162552e19dd2d278a6.zip | |
[feature/merging-style-components] Initializing locator and provider separately
Moving locator and path provider initialization out of style class
PHPBB3-10632
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 5e3bfed5ec..2cae38022e 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -132,11 +132,13 @@ class bbcode { $this->template_bitfield = new bitfield($user->theme['bbcode_bitfield']); - $style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager); + $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); $style->set_style(); $template = $style->template; $template->set_filenames(array('bbcode.html' => 'bbcode.html')); - $this->template_filename = $style->locator->get_source_file_for_handle('bbcode.html'); + $this->template_filename = $style_resource_locator->get_source_file_for_handle('bbcode.html'); } $bbcode_ids = $rowset = $sql = array(); |