From d2b27d11759cd1c668293a569aed1afaa7cfd741 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 11 Nov 2010 08:39:10 -0500
Subject: [PATCH] - Fix displaying of text/plain messages containing HTML entities

---
 program/include/main.inc |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/program/include/main.inc b/program/include/main.inc
index 4bf7213..31c9a08 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -556,10 +556,14 @@
       }
     else if ($mode=='remove')
       $str = strip_tags($str);
-    
+
+    $out = strtr($str, $encode_arr);
+
     // avoid douple quotation of &
-    $out = preg_replace('/&amp;([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('/&amp;([A-Za-z]{2,6}|#[0-9]{2,4});/', '&\\1;', $out);
+
     return $newlines ? nl2br($out) : $out;
     }
 

--
Gitblit v1.9.1