mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-18 07:31:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* 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
parent b7bd657882 c8dd12e5f4
commit ef8cc04dc8
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/includes/mcp/mcp_pm_reports.php
View File

@@ -122,6 +122,7 @@ class mcp_pm_reports
$message = bbcode_nl2br($message); $message = bbcode_nl2br($message);
$message = smiley_text($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')) if ($pm_info['message_attachment'] && $auth->acl_get('u_pm_download'))
{ {