You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@spamassassin.apache.org by mm...@apache.org on 2007/10/20 01:28:34 UTC

svn commit: r586641 - /spamassassin/trunk/lib/Mail/SpamAssassin/Message/Node.pm

Author: mmartinec
Date: Fri Oct 19 16:28:34 2007
New Revision: 586641

URL: http://svn.apache.org/viewvc?rev=586641&view=rev
Log:
replace experimental and broken utf8::downgrade() with encode("utf8"), Bug 5691

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Message/Node.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Message/Node.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Message/Node.pm?rev=586641&r1=586640&r2=586641&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Message/Node.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Message/Node.pm Fri Oct 19 16:28:34 2007
@@ -43,6 +43,8 @@
 use Mail::SpamAssassin::HTML;
 use Mail::SpamAssassin::Logger;
 
+use Encode;
+
 =item new()
 
 Generates an empty Node object and returns it.  Typically only called
@@ -398,7 +400,10 @@
   dbg("message: Converting...");
 
   my $rv = $converter->decode($data, 0);
-  utf8::downgrade($rv, 1);
+
+  # turn characters into octets if needed
+  $rv = Encode::encode('utf8',$rv)  if Encode::is_utf8($rv);
+
   return $rv
 }