bug 932: adjusmtent of function iconv_mime_decode bug-932
authorINOPIAE <inopiae@cacert.org>
Tue, 8 Sep 2015 20:26:22 +0000 (22:26 +0200)
committerBenny Baumann <BenBE@geshi.org>
Tue, 8 Sep 2015 20:31:53 +0000 (22:31 +0200)
manager/application/views/scripts/mail/full.phtml
manager/application/views/scripts/mail/index.phtml

index 01d8ff2..892215f 100644 (file)
@@ -26,7 +26,7 @@ else {
         print "    <tr>\n";
         print "        <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";
         print "        <td>" . $header->toaddress . "</td>";
-        print "        <td>" . htmlspecialchars(quoted_printable_decode($header->subject), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . "</td>";
+        print "        <td>" . htmlspecialchars(iconv_mime_decode($header->subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8'), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . "</td>";
         print "        <td>" . $header->date . "</td>";
         print "        <td>" . $header->Size . "</td>";
         print "        <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";
index 9e625e7..a37f092 100644 (file)
@@ -26,7 +26,7 @@ else {
         print "    <tr>\n";
         print "        <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";
         print "        <td>" . $header->toaddress . "</td>";
-        print "        <td>" . htmlspecialchars(iconv_mime_decode($header->subject, 'UTF-8'), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . "</td>";
+        print "        <td>" . htmlspecialchars(iconv_mime_decode($header->subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8'), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . "</td>";
         print "        <td>" . $header->date . "</td>";
         print "        <td>" . $header->Size . "</td>";
         print "        <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";