From bc8c4ac27020dd51b2d24fd145e74f6be5f458d5 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 26 Sep 2013 00:07:22 +0200 Subject: [PATCH 1/2] [ticket/11865] Add bbcodes to functional posting tests PHPBB3-11865 --- tests/functional/posting_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/functional/posting_test.php b/tests/functional/posting_test.php index 7fd1e4fdcf..dd95704952 100644 --- a/tests/functional/posting_test.php +++ b/tests/functional/posting_test.php @@ -22,8 +22,8 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case $crawler = self::request('GET', "viewtopic.php?t={$post['topic_id']}&sid={$this->sid}"); $this->assertContains('This is a test topic posted by the testing framework.', $crawler->filter('html')->text()); - // Test creating a reply - $post2 = $this->create_post(2, $post['topic_id'], 'Re: Test Topic 1', 'This is a test post posted by the testing framework.'); + // Test creating a reply with bbcode + $post2 = $this->create_post(2, $post['topic_id'], 'Re: Test Topic 1', 'This is a test [b]post[/b] posted by the testing framework.'); $crawler = self::request('GET', "viewtopic.php?t={$post2['topic_id']}&sid={$this->sid}"); $this->assertContains('This is a test post posted by the testing framework.', $crawler->filter('html')->text()); From 2794dc4e68fb8c5c741d96c3b0f685a7145ea74f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 26 Sep 2013 00:11:42 +0200 Subject: [PATCH 2/2] [ticket/11865] Convert old class name to namespaced version PHPBB3-11865 --- phpBB/includes/bbcode.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index f617b4b10a..cd2ca7ffce 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -132,7 +132,7 @@ class bbcode { $this->template_bitfield = new bitfield($user->style['bbcode_bitfield']); - $template = new phpbb\template\twig\twig($phpbb_filesystem, $config, $user, new phpbb_template_context(), $phpbb_extension_manager); + $template = new phpbb\template\twig\twig($phpbb_filesystem, $config, $user, new phpbb\template\context(), $phpbb_extension_manager); $template->set_style(); $template->set_filenames(array('bbcode.html' => 'bbcode.html')); $this->template_filename = $template->get_source_file_for_handle('bbcode.html');