- Fix displaying of text/plain messages containing HTML entities

1 files changed, 7 insertions, 3 deletions

diff --git a/program/include/main.inc b/program/include/main.inc
index 4bf721336..31c9a0805 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -556,10 +556,14 @@ function rep_specialchars_output($str, $enctype='', $mode='', $newlines=TRUE)
       }
     else if ($mode=='remove')
       $str = strip_tags($str);
-    
+
+    $out = strtr($str, $encode_arr);
+
     // avoid douple quotation of &
-    $out = preg_replace('/&([A-Za-z]{2,6}|#[0-9]{2,4});/', '&\\1;', strtr($str, $encode_arr));
-      
+    // commented out, because this breaks displaying of text with entity strings
+    // in text messages.
+    //$out = preg_replace('/&([A-Za-z]{2,6}|#[0-9]{2,4});/', '&\\1;', $out);
+
     return $newlines ? nl2br($out) : $out;
     }