From 37baef8f604bd509047d580b5dfb33d9c3f38031 Mon Sep 17 00:00:00 2001
From: lnu <lnu@f70e237a-67f3-0310-a06c-d2b8a7116972>
Date: Wed, 21 Sep 2005 12:38:57 +0000
Subject: fix another problem with escaped html

git-svn-id: svn+ssh://svn.gna.org/svn/feed2imap/trunk/feed2imap@67 f70e237a-67f3-0310-a06c-d2b8a7116972
---
 lib/feed2imap/channel.rb        | 2 +-
 lib/feed2imap/textconverters.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/feed2imap')

diff --git a/lib/feed2imap/channel.rb b/lib/feed2imap/channel.rb
index 3fcc3e8..9ed3bdc 100644
--- a/lib/feed2imap/channel.rb
+++ b/lib/feed2imap/channel.rb
@@ -149,7 +149,7 @@ class Item
         if e.children.length > 1
           s = ''
           e.children.each { |c| s += c.to_s }
-          @content = s.toUTF8(@channel.encoding).rmWhiteSpace!
+          @content = s.toUTF8(@channel.encoding).rmWhiteSpace!.text2html
         elsif e.children.length == 1
           if e.cdatas[0]
             @content = e.cdatas[0].to_s.toUTF8(@channel.encoding).rmWhiteSpace!
diff --git a/lib/feed2imap/textconverters.rb b/lib/feed2imap/textconverters.rb
index c6ae326..9145e5a 100644
--- a/lib/feed2imap/textconverters.rb
+++ b/lib/feed2imap/textconverters.rb
@@ -25,7 +25,7 @@ require 'feed2imap/html2text-parser'
 class String
   # is this text HTML ? search for tags
   def html?
-    return (self =~ /<p>/) || (self =~ /<br>/) || (self =~ /<br\s*(\/)?\s*>/)
+    return (self =~ /<p>/) || (self =~ /<br>/) || (self =~ /<br\s*(\/)?\s*>/) || (self =~ /<\/a>/) || (self =~ /<img.*>/)
   end
 
   # returns true if the text contains escaped HTML (with HTML entities)
-- 
cgit v1.2.3-54-g00ecf