diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-13 07:56:40 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-13 07:56:40 -0500 |
| commit | aae7a81270013f0f700033dd091fd9db216eb889 (patch) | |
| tree | b9c3566c7d3e5f6c56677cd1ae68be28bb4b1314 /phpBB/includes/bbcode.php | |
| parent | 10ee54d0280087a81236c05fbaf2c30f3b976b08 (diff) | |
| parent | 0916dc14efaa36073cdc9783401b818ecc0716cc (diff) | |
| download | forums-aae7a81270013f0f700033dd091fd9db216eb889.tar forums-aae7a81270013f0f700033dd091fd9db216eb889.tar.gz forums-aae7a81270013f0f700033dd091fd9db216eb889.tar.bz2 forums-aae7a81270013f0f700033dd091fd9db216eb889.tar.xz forums-aae7a81270013f0f700033dd091fd9db216eb889.zip | |
Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (101 commits)
[ticket/10491] Make recreate_database static.
[ticket/11088] Pass required objects in as arguments
[ticket/11088] Globalize objects in new permission function
[ticket/11088] Move permission creation to a function
[ticket/11088] Copy a_styles permission for a_extensions
[ticket/11088] Remove extraneous word from sentence in comment
[ticket/11088] Changed "file extensions" to "attachment extensions"
[ticket/11088] Fix the database updater to correctly manipulate the modules
[ticket/11088] Put language pack module move below extension module creation
[ticket/11088] Untested, progress on update script
[ticket/11088] Fix typo (period instead of comma)
[ticket/11088] Untested progress for update script
[ticket/11088] Added missing comma
[ticket/11088] Removed added space
[ticket/11088] Move style, extension and language pack management to customise
[ticket/11243] Show download all link on all pages of topic with attachments
[feature/template-events] Pass arguments in correct order.
[feature/template-events] Pass arguments in correct order.
[ticket/10491] Install board once per test run.
[ticket/11257] Do not require set_name() method to exist
...
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 b9ffa8091c..e8681420d4 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_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context()); + $template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, 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_filenames(array('bbcode.html' => 'bbcode.html')); |