aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
diff options
context:
space:
mode:
authorMikelAlejoBR <mikelalejobr@outlook.com>2018-07-31 16:06:49 +0200
committerMikelAlejoBR <mikelalejobr@outlook.com>2018-07-31 16:06:49 +0200
commit184d24bb166b754b571bd7ef49b7cfacf1c8381d (patch)
tree5034af65472b5a4be4fd58b2d118a8bd2ef9c659 /phpBB/includes/ucp
parent12fdfe145af65b26b42a6a9a18134f748264e04d (diff)
downloadforums-184d24bb166b754b571bd7ef49b7cfacf1c8381d.tar
forums-184d24bb166b754b571bd7ef49b7cfacf1c8381d.tar.gz
forums-184d24bb166b754b571bd7ef49b7cfacf1c8381d.tar.bz2
forums-184d24bb166b754b571bd7ef49b7cfacf1c8381d.tar.xz
forums-184d24bb166b754b571bd7ef49b7cfacf1c8381d.zip
[ticket/15622] Extract duplicated code
PHPBB3-15622
Diffstat (limited to 'phpBB/includes/ucp')
-rw-r--r--phpBB/includes/ucp/ucp_pm_compose.php24
1 files changed, 1 insertions, 23 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index e108356584..48bb9bf21f 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -974,30 +974,8 @@ function compose_pm($id, $mode, $action, $user_folders = array())
{
$quote_attributes['post_id'] = $post['msg_id'];
}
- $quote_text = $phpbb_container->get('text_formatter.utils')->generate_quote(
- censor_text($message_parser->message),
- $quote_attributes
- );
- if ($bbcode_status)
- {
- $message_parser->message = $message_link . $quote_text . "\n\n";
- }
- else
- {
- $offset = 0;
- $quote_string = "&gt; ";
- $message = censor_text(trim($message_parser->message));
- // see if we are nesting. It's easily tricked but should work for one level of nesting
- if (strpos($message, "&gt;") !== false)
- {
- $offset = 10;
- }
- $message = utf8_wordwrap($message, 75 + $offset, "\n");
- $message = $quote_string . $message;
- $message = str_replace("\n", "\n" . $quote_string, $message);
- $message_parser->message = $quote_username . " " . $user->lang['WROTE'] . ":\n" . $message . "\n";
- }
+ format_quote($bbcode_status, $quote_attributes, $phpbb_container->get('text_formatter.utils'), $message_parser, $message_link);
}
if (($action == 'reply' || $action == 'quote' || $action == 'quotepost') && !$preview && !$refresh)