diff options
Diffstat (limited to 'mail/squirrelmail/patches/patch-ab')
-rw-r--r-- | mail/squirrelmail/patches/patch-ab | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/mail/squirrelmail/patches/patch-ab b/mail/squirrelmail/patches/patch-ab index 773765eb517..5c1c77f030c 100644 --- a/mail/squirrelmail/patches/patch-ab +++ b/mail/squirrelmail/patches/patch-ab @@ -1,17 +1,11 @@ -$NetBSD: patch-ab,v 1.15 2010/03/04 16:00:37 taca Exp $ +$NetBSD: patch-ab,v 1.16 2010/03/07 03:41:49 taca Exp $ * Use case ignore match for detecting encoded word. * Fix encoding problem of attached filenames; don't convert encoding here. ---- functions/i18n.php.orig 2009-07-29 11:21:06.000000000 +0900 +--- functions/i18n.php.orig 2010-01-25 02:47:41.000000000 +0000 +++ functions/i18n.php -@@ -675,18 +675,11 @@ function japanese_charset_xtra() { - break; - case 'decodeheader': - $ret = str_replace("\t", "", $ret); -- if (preg_match('/=\?([^?]+)\?(q|b)\?([^?]+)\?=/', $ret)) -+ if (preg_match('/=\?([^?]*)\?(Q|B)\?([^?]*)\?=/i', $ret)) - $ret = @mb_decode_mimeheader($ret); +@@ -680,13 +680,6 @@ function japanese_charset_xtra() { $ret = @mb_convert_encoding($ret, 'EUC-JP', 'AUTO'); break; case 'downloadfilename': |