From 286a412a9ccfbecfb6a5390051e724361af82b23 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 4 Jun 2010 12:09:55 +0000 Subject: [PATCH] using charsets from translation class and defaulting to iso-8859-1, as thats what windows uses --- addressbook/inc/class.addressbook_hooks.inc.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/addressbook/inc/class.addressbook_hooks.inc.php b/addressbook/inc/class.addressbook_hooks.inc.php index cabd6a269e..5bcd91c1c7 100644 --- a/addressbook/inc/class.addressbook_hooks.inc.php +++ b/addressbook/inc/class.addressbook_hooks.inc.php @@ -166,20 +166,15 @@ class addressbook_hooks 'default'=> 'iso-8859-1', ); - $selectCharSet = array( - 'utf-8' => 'UTF-8', - 'iso-8859-1' => 'ISO-8859-1', - ); - $settings['vcard_charset'] = array( 'type' => 'select', 'label' => 'Charset for the vCard export', 'name' => 'vcard_charset', - 'values' => $selectCharSet, + 'values' => translation::get_installed_charsets(), 'help' => 'Which charset should be used for the vCard export.', 'xmlrpc' => True, 'admin' => false, - 'default'=> 'utf-8', + 'default'=> 'iso-8859-1', ); if ($GLOBALS['egw_info']['server']['contact_repository'] != 'ldap')