aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikelAlejoBR <mikelalejobr@outlook.com>2018-08-01 18:01:37 +0200
committerMikelAlejoBR <mikelalejobr@outlook.com>2018-08-01 18:01:37 +0200
commitada8bc9da2790eeb600d61222b23ffdb5f025bf6 (patch)
tree702882cf66b8fbdf036b23a884586ae5783f9cb7
parent521aec5923874f8757592a07e09357b323460b00 (diff)
downloadforums-ada8bc9da2790eeb600d61222b23ffdb5f025bf6.tar
forums-ada8bc9da2790eeb600d61222b23ffdb5f025bf6.tar.gz
forums-ada8bc9da2790eeb600d61222b23ffdb5f025bf6.tar.bz2
forums-ada8bc9da2790eeb600d61222b23ffdb5f025bf6.tar.xz
forums-ada8bc9da2790eeb600d61222b23ffdb5f025bf6.zip
[ticket/15622] Refactor message link concatenation
PHPBB3-15622
-rw-r--r--phpBB/includes/functions_content.php17
1 files changed, 5 insertions, 12 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index 1bc217b694..1e80da98d3 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -1778,14 +1778,7 @@ function format_quote($bbcode_status, $quote_attributes, $text_formatter_utils,
$quote_attributes
);
- if ($message_link)
- {
- $message_parser->message = $message_link . $quote_text . "\n\n";
- }
- else
- {
- $message_parser->message = $quote_text . "\n\n";
- }
+ $message_parser->message = $quote_text . "\n\n";
}
else
{
@@ -1803,10 +1796,10 @@ function format_quote($bbcode_status, $quote_attributes, $text_formatter_utils,
$message = str_replace("\n", "\n" . $quote_string, $message);
$message_parser->message = $quote_attributes['author'] . " " . $user->lang['WROTE'] . ":\n" . $message . "\n";
+ }
- if ($message_link)
- {
- $message_parser->message = $message_link . $message_parser->message;
- }
+ if ($message_link)
+ {
+ $message_parser->message = $message_link . $message_parser->message;
}
}