diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-11-23 15:00:13 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-11-23 15:00:13 +0000 |
| commit | 37bb95a5138dab0fcd69b9c721fe12ce3f579ac8 (patch) | |
| tree | a1dd2d2526528bcc8b9a7b063de143691de46196 /roundcubemail/program | |
| parent | 1b27ffa4d2ca72b85e9272a85ef5acfec08edfeb (diff) | |
Add fallback to default_charset when importing vcards
git-svn-id: https://svn.roundcube.net/trunk@2086 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/include/rcube_vcard.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/include/rcube_vcard.php b/roundcubemail/program/include/rcube_vcard.php index 412582d31..31797666b 100644 --- a/roundcubemail/program/include/rcube_vcard.php +++ b/roundcubemail/program/include/rcube_vcard.php @@ -416,7 +416,7 @@ class rcube_vcard 'ISO-8859-10', 'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'ISO-8859-16', 'WINDOWS-1252', 'WINDOWS-1251', 'BIG5', 'GB2312'); - if (function_exists('mb_detect_encoding') && ($enc = mb_detect_encoding($string, join(',', $encodings)))) + if (function_exists('mb_detect_encoding') && ($enc = mb_detect_encoding($string, $encodings))) return $enc; // No match, check for UTF-8 @@ -433,7 +433,7 @@ class rcube_vcard )*\z/xs', substr($string, 0, 2048))) return 'UTF-8'; - return 'ISO-8859-1'; # fallback to Latin-1 + return rcmail::get_instance()->config->get('default_charset', 'ISO-8859-1'); # fallback to Latin-1 } } |