aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_pm_compose.php
diff options
context:
space:
mode:
authorMikelAlejoBR <mikelalejobr@outlook.com>2018-08-01 15:26:14 +0200
committerMikelAlejoBR <mikelalejobr@outlook.com>2018-08-01 16:19:30 +0200
commitce2196517bec7dd05f85e7253cb124c0f6d92581 (patch)
treee2676ea74af38d5a9e9930d87fd7b77ecff7e281 /phpBB/includes/ucp/ucp_pm_compose.php
parent184d24bb166b754b571bd7ef49b7cfacf1c8381d (diff)
downloadforums-ce2196517bec7dd05f85e7253cb124c0f6d92581.tar
forums-ce2196517bec7dd05f85e7253cb124c0f6d92581.tar.gz
forums-ce2196517bec7dd05f85e7253cb124c0f6d92581.tar.bz2
forums-ce2196517bec7dd05f85e7253cb124c0f6d92581.tar.xz
forums-ce2196517bec7dd05f85e7253cb124c0f6d92581.zip
[ticket/15622] Fix message link generation
Now the message link is generated in different formats depending on whether BBCodes are allowed or not in the site. PHPBB3-15622
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_compose.php')
-rw-r--r--phpBB/includes/ucp/ucp_pm_compose.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 48bb9bf21f..d201c5fe73 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -954,7 +954,16 @@ function compose_pm($id, $mode, $action, $user_folders = array())
$post_id = $request->variable('p', 0);
if ($config['allow_post_links'])
{
- $message_link = "[url=" . generate_board_url() . "/viewtopic.$phpEx?p={$post_id}#p{$post_id}]{$user->lang['SUBJECT']}{$user->lang['COLON']} {$message_subject}[/url]\n\n";
+ $message_link = generate_board_url() . "/viewtopic.$phpEx?p={$post_id}#p{$post_id}";
+ $message_link_subject = "{$user->lang['SUBJECT']}{$user->lang['COLON']} {$message_subject}";
+ if ($bbcode_status)
+ {
+ $message_link = "[url=" . $message_link . "]" . $message_link_subject . "[/url]\n\n";
+ }
+ else
+ {
+ $message_link = $message_link . " - " . $message_link_subject . "\n\n";
+ }
}
else
{