From aa7fc0f9f9ff013328c2e72da3968ce2d25c801d Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Thu, 10 Mar 2011 16:55:11 +0000 Subject: [PATCH] Always remove country code --- addressbook/inc/hook_config.inc.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/addressbook/inc/hook_config.inc.php b/addressbook/inc/hook_config.inc.php index 78ddf2803b..7c4eddef0e 100644 --- a/addressbook/inc/hook_config.inc.php +++ b/addressbook/inc/hook_config.inc.php @@ -109,11 +109,9 @@ function org_fileds_to_update($config) } // Remove country codes as an option, it will be added by BO constructor - if(in_array('adr_one_countrycode', $supported_fields)) - { - unset($fields['adr_one_countrycode']); - unset($fields['adr_two_countrycode']); - } + unset($fields['adr_one_countrycode']); + unset($fields['adr_two_countrycode']); + return html::checkbox_multiselect('newsettings[org_fileds_to_update]', $config['org_fileds_to_update'] ? $config['org_fileds_to_update'] : $bocontacts->org_fields,$fields,true,'',4); }