Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11292] Fix: Newlines removed in display of PM reports
This commit is contained in:
Andreas Fischer 2013-01-06 02:12:25 +01:00
commit ef8cc04dc8

View file

@ -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'))
{