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 /phpBB | |
| 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
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 6 |
1 files changed, 5 insertions, 1 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); } |