diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-12-12 16:30:50 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-12-12 16:30:50 -0600 |
| commit | 7ae5b62fc68017b6bdd5e55c9641e92a86a1f487 (patch) | |
| tree | 54e156815f13c40e9b880712de32ae13728ffdae /phpBB/includes/bbcode.php | |
| parent | 84284a9ccee7d5ccc658c3d1f751a5254b3b9175 (diff) | |
| parent | 9420647c43b300699afe6fe72f09d1746daf64a2 (diff) | |
| download | forums-7ae5b62fc68017b6bdd5e55c9641e92a86a1f487.tar forums-7ae5b62fc68017b6bdd5e55c9641e92a86a1f487.tar.gz forums-7ae5b62fc68017b6bdd5e55c9641e92a86a1f487.tar.bz2 forums-7ae5b62fc68017b6bdd5e55c9641e92a86a1f487.tar.xz forums-7ae5b62fc68017b6bdd5e55c9641e92a86a1f487.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
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')); |