diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-13 09:36:24 -0400 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-13 09:36:24 -0400 |
| commit | 8352a7cadab7e16eb8eac29d869e06864acb1a93 (patch) | |
| tree | e78344d1237c9ca6e2d3004e4c6d2916c6514750 /phpBB/includes/bbcode.php | |
| parent | 28e3341fcde976754f122a9c540b20aa705658fc (diff) | |
| parent | b5651c0289054f2f4453806200506968241f9a82 (diff) | |
| download | forums-8352a7cadab7e16eb8eac29d869e06864acb1a93.tar forums-8352a7cadab7e16eb8eac29d869e06864acb1a93.tar.gz forums-8352a7cadab7e16eb8eac29d869e06864acb1a93.tar.bz2 forums-8352a7cadab7e16eb8eac29d869e06864acb1a93.tar.xz forums-8352a7cadab7e16eb8eac29d869e06864acb1a93.zip | |
Merge remote-tracking branch 'phpbb/develop' into ticket/9657
* phpbb/develop: (216 commits)
[ticket/11626] Remove last reference to template in ldap
[ticket/11626] Remove LDAP dependency on template
[develop-olympus] Increment version number to 3.0.13-dev.
[develop-olympus] Add changelog for 3.0.12 release.
[develop-olympus] Bump version numbers for 3.0.12-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.12 releases.
[ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
[ticket/11668] Run lint test at the end of the test suite
[ticket/11548] Fix test errors in groups test on develop
[ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
[ticket/11548] Fix incorrect usage of array_map on acp groups page
[ticket/11665] Fix test class name
[ticket/11664] Stop creating php.html file in root path in tests
[ticket/11665] Can't change file names already sent to set_filenames
[ticket/11662] Typos: occured -> occurred
[ticket/11662] Typos: occured -> occurred
[ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
[feature/auth-refactor] Add parent::setUp() in setUp()
[feature/auth-refactor] Changes
[feature/auth-refactor] DataProvider for acp_board test
...
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(); |