aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_pm_reports.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-01-06 02:12:25 +0100
committerAndreas Fischer <bantu@phpbb.com>2013-01-06 02:12:25 +0100
commitef8cc04dc81391f606ccd52f4180fa3cf585924c (patch)
treeafc436b5f7a529f65b55f6fe2059503db8c1c854 /phpBB/includes/mcp/mcp_pm_reports.php
parentb7bd65788259108cf784aa59fccd80e802dab656 (diff)
parentc8dd12e5f4c064b9e1a470b33f91076ea590ad2f (diff)
downloadforums-ef8cc04dc81391f606ccd52f4180fa3cf585924c.tar
forums-ef8cc04dc81391f606ccd52f4180fa3cf585924c.tar.gz
forums-ef8cc04dc81391f606ccd52f4180fa3cf585924c.tar.bz2
forums-ef8cc04dc81391f606ccd52f4180fa3cf585924c.tar.xz
forums-ef8cc04dc81391f606ccd52f4180fa3cf585924c.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11292] Fix: Newlines removed in display of PM reports
Diffstat (limited to 'phpBB/includes/mcp/mcp_pm_reports.php')
-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 be18dba944..86650947c7 100644
--- a/phpBB/includes/mcp/mcp_pm_reports.php
+++ b/phpBB/includes/mcp/mcp_pm_reports.php
@@ -122,6 +122,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'))
{