Fix messages

PHPFusion · Jan 7, 2020 · 31cfd3d · 31cfd3d
1 parent cb76548
commit 31cfd3d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/includes/classes/PHPFusion/PrivateMessages.inc b/includes/classes/PHPFusion/PrivateMessages.inc
@@ -358,7 +358,7 @@ class PrivateMessages {
                         'link'           => BASEDIR."messages.php?folder=".$_GET['folder']."&amp;msg_read=".$data['message_id'],
                         'name'           => $data['message_subject'],
                         'message_header' => "<strong>".$this->locale['462'].":</strong> ".$data['message_subject'],
-                        'message_text'   => $data['message_smileys'] == "y" ? parseubb(parsesmileys($data['message_message'])) : parseubb($data['message_message']),
+                        'message_text'   => $data['message_smileys'] == "y" ? nl2br(parseubb(parsesmileys($data['message_message']))) : nl2br(parseubb($data['message_message'])),
                     ];
                     $this->info['items'][$data['message_id']] = $data;
                 }
@@ -407,7 +407,7 @@ class PrivateMessages {
                 'link'           => BASEDIR."messages.php?folder=".$_GET['folder']."&amp;msg_read=".$data['message_id'],
                 'name'           => $data['message_subject'],
                 'message_header' => "<strong>".$this->locale['462'].":</strong> ".$data['message_subject'],
-                'message_text'   => $data['message_smileys'] == "y" ? parseubb(parsesmileys($data['message_message'])) : parseubb($data['message_message'])
+                'message_text'   => $data['message_smileys'] == "y" ? nl2br(parseubb(parsesmileys($data['message_message']))) : nl2br(parseubb($data['message_message']))
             ];
 
             $this->info['items'][$data['message_id']] = $data;

diff --git a/themes/templates/global/messages.php b/themes/templates/global/messages.php
@@ -74,7 +74,7 @@ function display_inbox($info) {
                         'user_level'   => getgroupname($data['user_level']),
                         'date'         => showdate($locale['date_day'], $data['message_datestamp']),
                         'timer'        => timer($data['message_datestamp']),
-                        'message'      => parse_textarea(nl2br($data['message']['message_text']), TRUE, TRUE, FALSE),
+                        'message'      => $data['message']['message_text'],
                         'reply_form'   => $info['reply_form']
                     ]);