summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-09-08 20:37:53 +0200
committerBenny Baumann <BenBE@geshi.org>2015-09-08 20:37:53 +0200
commit7f20913d8b39bb701254d1e9e326578b1590721d (patch)
treec40de78eb1558cf542fe6c73adc6c575cf2c773e
parent4e5c9dd72b45ec7d59a13b28ac1c4ccd600cd95b (diff)
parent9987c02e3e9e8f1d9b6219c1384297036c583da7 (diff)
downloadcacert-mgr-7f20913d8b39bb701254d1e9e326578b1590721d.tar.gz
cacert-mgr-7f20913d8b39bb701254d1e9e326578b1590721d.tar.xz
cacert-mgr-7f20913d8b39bb701254d1e9e326578b1590721d.zip
Merge branch 'bug-932'
-rw-r--r--manager/application/views/scripts/mail/index.phtml2
1 files changed, 1 insertions, 1 deletions
diff --git a/manager/application/views/scripts/mail/index.phtml b/manager/application/views/scripts/mail/index.phtml
index 3eecfdc..9e625e7 100644
--- a/manager/application/views/scripts/mail/index.phtml
+++ b/manager/application/views/scripts/mail/index.phtml
@@ -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, '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>";