aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-01-06 02:11:10 +0100
committerAndreas Fischer <bantu@phpbb.com>2013-01-06 02:11:10 +0100
commitc8dd12e5f4c064b9e1a470b33f91076ea590ad2f (patch)
treea2c5bddc637f07b3e75ddfd3fce7221e7386da7d
parentcbe91e5b5096dc1ed659530632f0fa64d75e8dd9 (diff)
parent5056f162351420440bf989d0b1cfc6c325499f7a (diff)
downloadforums-c8dd12e5f4c064b9e1a470b33f91076ea590ad2f.tar
forums-c8dd12e5f4c064b9e1a470b33f91076ea590ad2f.tar.gz
forums-c8dd12e5f4c064b9e1a470b33f91076ea590ad2f.tar.bz2
forums-c8dd12e5f4c064b9e1a470b33f91076ea590ad2f.tar.xz
forums-c8dd12e5f4c064b9e1a470b33f91076ea590ad2f.zip
Merge remote-tracking branch 'gn36/ticket/11292' into develop-olympus
* gn36/ticket/11292: [ticket/11292] Fix: Newlines removed in display of PM reports
-rw-r--r--phpBB/includes/mcp/mcp_pm_reports.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php
index 72f77fae7c..77bc7680e6 100644
--- a/phpBB/includes/mcp/mcp_pm_reports.php
+++ b/phpBB/includes/mcp/mcp_pm_reports.php
@@ -123,6 +123,7 @@ class mcp_pm_reports
$message = bbcode_nl2br($message);
$message = smiley_text($message);
+ $report['report_text'] = make_clickable(bbcode_nl2br($report['report_text']));
if ($pm_info['message_attachment'] && $auth->acl_get('u_pm_download'))
{