[Hastymail-cvs] hastymail/lib general.php,1.282,1.283

[<sai...@us...>]

Update of /cvsroot/hastymail/hastymail/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7890/lib

Modified Files:
	general.php 
Log Message:
more encoding clean up


Index: general.php
===================================================================
RCS file: /cvsroot/hastymail/hastymail/lib/general.php,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -d -r1.282 -r1.283
--- general.php	21 Dec 2005 17:36:25 -0000	1.282
+++ general.php	21 Dec 2005 19:01:38 -0000	1.283
@@ -314,11 +314,10 @@
     switch ($charset) {
         case 'iso-8859-1':
             if (!$html) {
-                $result = hm_utf8_to_html(hm_htmlize(utf8_encode($text)));
+                $result = hm_utf8_to_html(hm_htmlize($text), $encode);
             }
             else {
-                $result = hm_utf8_to_html(utf8_encode($text));
-                //$result = utf8_encode($text);
+                $result = hm_utf8_to_html($text, $encode);
             }
             break;
         case 'UTF-8':