From c23c2cd0639bba582aec4da9f612df18bf95e4ca Mon Sep 17 00:00:00 2001 From: tokul Date: Sun, 27 Jul 2003 09:13:29 +0000 Subject: [PATCH] preg_match('/iso-8859-/'.. covered all iso-8859 charsets (iso-8859-1, iso-8859-2, iso-8859-13 etc). stristr does not do that. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5436 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/imap_utf7_local.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/imap_utf7_local.php b/functions/imap_utf7_local.php index c2a9ce8b..ecaa7ca3 100644 --- a/functions/imap_utf7_local.php +++ b/functions/imap_utf7_local.php @@ -16,7 +16,7 @@ function sqimap_mb_convert_encoding($str, $to_encoding, $from_encoding, $default // Allows mbstring functions only with iso-8859-*, utf-8 and // iso-2022-jp (Japanese) // koi8-r and gb2312 can be added only in php 4.3+ - if ( stristr('iso-8859-',$default_charset) || + if ( stristr('iso-8859-',substr($default_charset,0,9)) || stristr('utf-8',$default_charset) || stristr('iso-2022-jp',$default_charset) ) { if (function_exists('mb_convert_encoding')) { -- 2.25.1