From 329dee31a9f2aa99c0654c901038f2b2410385ad Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Wed, 21 Mar 2007 09:54:10 +0000
Subject: Updated PEAR::Mail_mime package

git-svn-id: https://svn.roundcube.net/trunk@514 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/lib/html2text.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'roundcubemail/program/lib/html2text.inc')

diff --git a/roundcubemail/program/lib/html2text.inc b/roundcubemail/program/lib/html2text.inc
index 0ac72f7b3..7d7d9d1f4 100644
--- a/roundcubemail/program/lib/html2text.inc
+++ b/roundcubemail/program/lib/html2text.inc
@@ -112,7 +112,7 @@ class html2text
         "/[\n\t]+/",                             // Newlines and tabs
         '/<script[^>]*>.*?<\/script>/i',         // <script>s -- which strip_tags supposedly has problems with
         //'/<!-- .* -->/',                         // Comments -- which strip_tags might have problem a with
-        '/<a [^>]*href="([^"]+)"[^>]*>(.+?)<\/a>/ie', // <a href="">
+        '/<a [^>]*href=("|\')([^"\']+)\1[^>]*>(.+?)<\/a>/ie', // <a href="">
         '/<h[123][^>]*>(.+?)<\/h[123]>/ie',      // H1 - H3
         '/<h[456][^>]*>(.+?)<\/h[456]>/ie',      // H4 - H6
         '/<p[^>]*>/i',                           // <P>
@@ -161,7 +161,7 @@ class html2text
         ' ',                                    // Newlines and tabs
         '',                                     // <script>s -- which strip_tags supposedly has problems with
         //'',                                  // Comments -- which strip_tags might have problem a with
-        '$this->_build_link_list("\\1", "\\2")', // <a href="">
+        '$this->_build_link_list("\\2", "\\3")', // <a href="">
         "strtoupper(\"\n\n\\1\n\n\")",          // H1 - H3
         "ucwords(\"\n\n\\1\n\")",               // H4 - H6
         "\n\n",                                 // <P>
-- 
cgit v1.2.3