diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-18 22:36:13 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-04-18 22:36:20 -0400 |
| commit | a650da79cb9acbaa9f01565c4cf1001ab7cf7551 (patch) | |
| tree | e09f4d8af05bfef763544c826dd18b2788a2efe9 /phpBB/includes/bbcode.php | |
| parent | d4b89a13b1371cb32af2be453ab04d9013d439fa (diff) | |
| parent | ed9a58a6ccea5b9b2685488ff0cfc45f0ccdbeb5 (diff) | |
| download | forums-a650da79cb9acbaa9f01565c4cf1001ab7cf7551.tar forums-a650da79cb9acbaa9f01565c4cf1001ab7cf7551.tar.gz forums-a650da79cb9acbaa9f01565c4cf1001ab7cf7551.tar.bz2 forums-a650da79cb9acbaa9f01565c4cf1001ab7cf7551.tar.xz forums-a650da79cb9acbaa9f01565c4cf1001ab7cf7551.zip | |
Merge PR #761 branch 'naderman/ticket/10756' into develop
* naderman/ticket/10756:
[ticket/10756] Fixing variable declarations in style and template classes
[ticket/10756] Renaming phpbb_style_template to phpbb_template
[ticket/10756] Removing path provider from template class
[ticket/10756] Creating locator interface
[ticket/10756] Renaming template classes
[ticket/10756] Moving template classes
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 612ced8ad6..fde917e5b1 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -134,7 +134,7 @@ 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()); - $template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, $style_path_provider); + $template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator); $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')); |