From 97523a99f31c70a37509b1037ec61b3a7e62dcd3 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 7 Mar 2011 17:25:54 +0000 Subject: [PATCH] Fix default country from preferences, use country code --- addressbook/inc/class.addressbook_ui.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index 22d998d645..0902366ffc 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -52,6 +52,7 @@ class addressbook_ui extends addressbook_bo 'adr_one_region', 'adr_one_postalcode', 'adr_one_countryname', + 'adr_one_countrycode', 'email', 'url', 'tel_work', @@ -1395,8 +1396,8 @@ class addressbook_ui extends addressbook_bo { if ($GLOBALS['egw_info']['user']['preferences']['common']['country']) { - $content['adr_one_countryname'] = - $GLOBALS['egw']->country->get_full_name($GLOBALS['egw_info']['user']['preferences']['common']['country']); + $content['adr_one_countrycode'] = + $GLOBALS['egw_info']['user']['preferences']['common']['country']; } if ($this->prefs['fileas_default']) $content['fileas_type'] = $this->prefs['fileas_default']; }