mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-10 05:18:52 +00:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/11292] Fix: Newlines removed in display of PM reports
This commit is contained in:
commit
ef8cc04dc8
1 changed files with 1 additions and 0 deletions
|
@ -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'))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue