diff options
| author | David King <imkingdavid@gmail.com> | 2013-07-11 20:43:41 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-07-11 20:43:41 -0400 |
| commit | 8b7aef6f938bf7c08d41908e78b6e71117adba38 (patch) | |
| tree | d39d9f3720e4afe78d23772e15830a2b12f1f5ba /phpBB/includes/bbcode.php | |
| parent | b9c290b5480a958eabeef66d5e9af799f77e4566 (diff) | |
| parent | b1d3c1bf6990c8105c18eb9db06ebf9c974b0899 (diff) | |
| download | forums-8b7aef6f938bf7c08d41908e78b6e71117adba38.tar forums-8b7aef6f938bf7c08d41908e78b6e71117adba38.tar.gz forums-8b7aef6f938bf7c08d41908e78b6e71117adba38.tar.bz2 forums-8b7aef6f938bf7c08d41908e78b6e71117adba38.tar.xz forums-8b7aef6f938bf7c08d41908e78b6e71117adba38.zip | |
Merge branch 'develop' into ticket/11215
* develop: (176 commits)
[feature/bootstrap-dic] Bootstrap container from config.php
[ticket/11548] Use new static methods for request and submit
[ticket/10772] Updating tests
[ticket/10772] Remove 3.1 code
[ticket/11388] Add newlines at EOF
[ticket/11388] INCLUDECSS
[ticket/11548] Run array_map on complete error array and not just colour_error
[ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
[ticket/11388] Do not append assets_version if using remote path (e.g. http)
[ticket/11388] Fix typo
[ticket/11388] Remove typehints (causing tests to fail)
[ticket/11388] Disable cache if IN_INSTALL defined
[ticket/11388] Do not modify by reference
[ticket/11388] typehits
[ticket/11388] INCLUDEJS test for //(url)
[ticket/11388] INCLUDEJS supports //(url)
[ticket/11388] Fixing includejs test
[ticket/11388] includejs inherit from includeasset
[feature/twig] Unit tests for includejs
[ticket/8319] Add migration file for update change
...
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index c198abeb54..fd00728510 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -134,11 +134,11 @@ 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(), $phpbb_root_path); - $template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $style_resource_locator, new phpbb_template_context(), $phpbb_extension_manager); + $template = new phpbb_template_twig($phpbb_root_path, $phpEx, $config, $user, 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')); - $this->template_filename = $style_resource_locator->get_source_file_for_handle('bbcode.html'); + $this->template_filename = $template->get_source_file_for_handle('bbcode.html'); } $bbcode_ids = $rowset = $sql = array(); |