summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-11-23 15:00:13 +0000
committerthomascube <thomas@roundcube.net>2008-11-23 15:00:13 +0000
commitae9124d3a92e2fd1d507d9dcba49209463391ad7 (patch)
treec89c9bc5a144e1608e947069fa315711dec8014a /program/include
parent456c7e40c5b0d3dbc005a9b5eb8887b17ce65c16 (diff)
Add fallback to default_charset when importing vcards
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_vcard.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/include/rcube_vcard.php b/program/include/rcube_vcard.php
index 412582d31..31797666b 100644
--- a/program/include/rcube_vcard.php
+++ b/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
}
}