summaryrefslogtreecommitdiff
path: root/roundcubemail
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-06-03 12:22:41 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-06-03 12:22:41 +0000
commitc464e162851372265c19b0957bd4c988a42d0179 (patch)
tree7657a8c189a73a7b5c0e1b09d8d831a15d849641 /roundcubemail
parent32e197070b675ceb5ac6ee9ae8aa6a412e0629b5 (diff)
- Add line-break in place of <DIV> tag (#1486666)
git-svn-id: https://svn.roundcube.net/trunk@3706 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
-rw-r--r--roundcubemail/program/lib/html2text.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/roundcubemail/program/lib/html2text.php b/roundcubemail/program/lib/html2text.php
index 49c636f3c..572942e21 100644
--- a/roundcubemail/program/lib/html2text.php
+++ b/roundcubemail/program/lib/html2text.php
@@ -148,7 +148,6 @@ class html2text
'/[ ]{2,}/', // Runs of spaces, pre-handling
'/<script[^>]*>.*?<\/script>/i', // <script>s -- which strip_tags supposedly has problems with
'/<style[^>]*>.*?<\/style>/i', // <style>s -- which strip_tags supposedly has problems with
- //'/<!-- .* -->/', // Comments -- which strip_tags might have problem a with
'/<p[^>]*>/i', // <P>
'/<br[^>]*>/i', // <br>
'/<i[^>]*>(.*?)<\/i>/i', // <i>
@@ -158,6 +157,7 @@ class html2text
'/<li[^>]*>(.*?)<\/li>/i', // <li> and </li>
'/<li[^>]*>/i', // <li>
'/<hr[^>]*>/i', // <hr>
+ '/<div[^>]*>/i', // <div>
'/(<table[^>]*>|<\/table>)/i', // <table> and </table>
'/(<tr[^>]*>|<\/tr>)/i', // <tr> and </tr>
'/<td[^>]*>(.*?)<\/td>/i', // <td> and </td>
@@ -192,8 +192,7 @@ class html2text
' ', // Runs of spaces, pre-handling
'', // <script>s -- which strip_tags supposedly has problems with
'', // <style>s -- which strip_tags supposedly has problems with
- //'', // Comments -- which strip_tags might have problem a with
- "\n\n", // <P>
+ "\n\n", // <P>
"\n", // <br>
'_\\1_', // <i>
'_\\1_', // <em>
@@ -202,6 +201,7 @@ class html2text
"\t* \\1\n", // <li> and </li>
"\n\t* ", // <li>
"\n-------------------------\n", // <hr>
+ "<div>\n", // <div>
"\n\n", // <table> and </table>
"\n", // <tr> and </tr>
"\t\t\\1\n", // <td> and </td>