diff options
| author | David King <imkingdavid@gmail.com> | 2013-09-25 16:09:08 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-09-25 16:09:08 -0700 |
| commit | 427f73a3238e54f1a3e44047716c88ee93c7fcfe (patch) | |
| tree | e9d1956cf1887f98c9a433bc7d446ed456272a19 | |
| parent | 468133c07f1dd27bedb2f31c904708c6374a7989 (diff) | |
| parent | 2794dc4e68fb8c5c741d96c3b0f685a7145ea74f (diff) | |
| download | forums-427f73a3238e54f1a3e44047716c88ee93c7fcfe.tar forums-427f73a3238e54f1a3e44047716c88ee93c7fcfe.tar.gz forums-427f73a3238e54f1a3e44047716c88ee93c7fcfe.tar.bz2 forums-427f73a3238e54f1a3e44047716c88ee93c7fcfe.tar.xz forums-427f73a3238e54f1a3e44047716c88ee93c7fcfe.zip | |
Merge pull request #1732 from nickvergessen/ticket/11865
[ticket/11865] includes/bbcode.php is missing namespace change
| -rw-r--r-- | phpBB/includes/bbcode.php | 2 | ||||
| -rw-r--r-- | tests/functional/posting_test.php | 4 |
2 files changed, 3 insertions, 3 deletions
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'); 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()); |