diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-15 13:13:21 +0200 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-15 13:13:21 +0200 |
| commit | 3997ffac2a2e6f422dcd5cd5bd076edee6fa91dd (patch) | |
| tree | 2436f29908131c404dc3bcb094ba380bb65744c1 /phpBB/includes/bbcode.php | |
| parent | 39944a08b9ea031dfc156f61ad0d8f4c594882e5 (diff) | |
| download | forums-3997ffac2a2e6f422dcd5cd5bd076edee6fa91dd.tar forums-3997ffac2a2e6f422dcd5cd5bd076edee6fa91dd.tar.gz forums-3997ffac2a2e6f422dcd5cd5bd076edee6fa91dd.tar.bz2 forums-3997ffac2a2e6f422dcd5cd5bd076edee6fa91dd.tar.xz forums-3997ffac2a2e6f422dcd5cd5bd076edee6fa91dd.zip | |
[feature/merging-style-components] Creating style class
Creating phpbb_style class, changing template initialization to style initialization
PHPBB3-10632
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 61271545bd..3831cb03ad 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -132,12 +132,11 @@ class bbcode { $this->template_bitfield = new bitfield($user->theme['bbcode_bitfield']); - $template_locator = new phpbb_style_locator(); - $template_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider()); - $template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $template_locator, $template_path_provider); + $style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager); + $template = $style->template; $template->set_template(); - $template_locator->set_filenames(array('bbcode.html' => 'bbcode.html')); - $this->template_filename = $template_locator->get_source_file_for_handle('bbcode.html'); + $template->set_filenames(array('bbcode.html' => 'bbcode.html')); + $this->template_filename = $style->locator->get_source_file_for_handle('bbcode.html'); } $bbcode_ids = $rowset = $sql = array(); |