diff options
| author | JoshyPHP <s9e.dev@gmail.com> | 2015-05-25 21:04:12 +0200 |
|---|---|---|
| committer | JoshyPHP <s9e.dev@gmail.com> | 2015-05-25 21:33:17 +0200 |
| commit | 64e1824abdb2a9c860e049f10ecc81c051160ff5 (patch) | |
| tree | d6275e95fff83fa5a541b958fdfc7a7f753d9637 | |
| parent | 2a7a06da2a166b814732bdfa790e53b80da8a612 (diff) | |
| download | forums-64e1824abdb2a9c860e049f10ecc81c051160ff5.tar forums-64e1824abdb2a9c860e049f10ecc81c051160ff5.tar.gz forums-64e1824abdb2a9c860e049f10ecc81c051160ff5.tar.bz2 forums-64e1824abdb2a9c860e049f10ecc81c051160ff5.tar.xz forums-64e1824abdb2a9c860e049f10ecc81c051160ff5.zip | |
[ticket/13847] Updated ucp_pm_compose to use utils when forwarding
PHPBB3-13847
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 6 | ||||
| -rw-r--r-- | tests/functional/private_messages_test.php | 15 |
2 files changed, 19 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 67e53718a0..53be1b3b29 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -979,7 +979,11 @@ function compose_pm($id, $mode, $action, $user_folders = array()) $forward_text[] = sprintf($user->lang['FWD_FROM'], $quote_username_text); $forward_text[] = sprintf($user->lang['FWD_TO'], implode($user->lang['COMMA_SEPARATOR'], $fwd_to_field['to'])); - $message_parser->message = implode("\n", $forward_text) . "\n\n[quote="{$quote_username}"]\n" . censor_text(trim($message_parser->message)) . "\n[/quote]"; + $quote_text = $phpbb_container->get('text_formatter.utils')->generate_quote( + censor_text(trim($message_parser->message)), + array('author' => $quote_username) + ); + $message_parser->message = implode("\n", $forward_text) . "\n\n" . $quote_text; $message_subject = ((!preg_match('/^Fwd:/', $message_subject)) ? 'Fwd: ' : '') . censor_text($message_subject); } diff --git a/tests/functional/private_messages_test.php b/tests/functional/private_messages_test.php index 4851fc4c64..3f602d62fb 100644 --- a/tests/functional/private_messages_test.php +++ b/tests/functional/private_messages_test.php @@ -67,7 +67,7 @@ class phpbb_functional_private_messages_test extends phpbb_functional_test_case $this->assertContains($this->lang('CONFIG_UPDATED'), $crawler->filter('.successbox')->text()); } - public function test_quote() + public function test_quote_post() { $text = 'Test post'; $expected = '[quote="admin"]' . $text . '[/quote]'; @@ -80,4 +80,17 @@ class phpbb_functional_private_messages_test extends phpbb_functional_test_case $this->assertContains($expected, $crawler->filter('textarea#message')->text()); } + + public function test_quote_forward() + { + $text = 'This is a test private message sent by the testing framework.'; + $expected = '[quote="admin"]' . $text . '[/quote]'; + + $this->login(); + $message_id = $this->create_private_message('Test', $text, array(2)); + + $crawler = self::request('GET', 'ucp.php?i=pm&mode=compose&action=forward&f=0&p=' . $message_id . '&sid=' . $this->sid); + + $this->assertContains($expected, $crawler->filter('textarea#message')->text()); + } } |