diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-13 19:19:57 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-13 19:19:57 -0600 |
| commit | 8e6f9b38fb14cc81ba428fd8a74d23077bb63863 (patch) | |
| tree | a04a860a04bbfbbed6692dce7bd59468522f311e /phpBB/includes/bbcode.php | |
| parent | 249f3c8885d461ae3981dfd7b62093c2175175e3 (diff) | |
| parent | ffd531e4fd31fee31c6fbd8c94cb6077cd21a82d (diff) | |
| download | forums-8e6f9b38fb14cc81ba428fd8a74d23077bb63863.tar forums-8e6f9b38fb14cc81ba428fd8a74d23077bb63863.tar.gz forums-8e6f9b38fb14cc81ba428fd8a74d23077bb63863.tar.bz2 forums-8e6f9b38fb14cc81ba428fd8a74d23077bb63863.tar.xz forums-8e6f9b38fb14cc81ba428fd8a74d23077bb63863.zip | |
Merge branch 'ticket/11103' of github.com:EXreaction/phpbb3 into ticket/11103
# By Oleg Pudeyev (42) and others
# Via David King (2) and others
* 'ticket/11103' of github.com:EXreaction/phpbb3: (58 commits)
[ticket/11103] Revert changes to constants.php from my IDE
[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/10972] Drop user deletion.
[ticket/10972] Tweak user addition.
[ticket/10972] Add destroy method to mock cache.
[ticket/10972] Add mock null cache.
[ticket/10972] Backport get_db from develop.
[ticket/10972] Added explicit checks for creating duplicate users.
[ticket/10972] Moved tests into appropriate places and added comments
[ticket/10972] Added methods for creating and deleting basic users
[feature/template-events] Order extensions in mock extension manager.
[feature/template-events] Changes per imkingdavid's review.
[feature/template-events] Make style names private on template.
[feature/template-events] Test for event that is defined in parent style only.
[feature/template-events] Specify style names, add inheritance tests.
[feature/template-events] Normalize expected directory trees.
[feature/template-events] Allow dataset to be correctly selectable.
[feature/template-events] Dataset for template event testing with inheritance.
...
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')); |