holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix default country from preferences, use country code

Browse Source
This commit is contained in:
Nathan Gray 2011-03-07 17:25:54 +00:00
parent dd8a8eab45
commit 97523a99f3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -52,6 +52,7 @@ class addressbook_ui extends addressbook_bo
'adr_one_region', 'adr_one_region',
'adr_one_postalcode', 'adr_one_postalcode',
'adr_one_countryname', 'adr_one_countryname',
'adr_one_countrycode',
'email', 'email',
'url', 'url',
'tel_work', 'tel_work',
@ -1395,8 +1396,8 @@ class addressbook_ui extends addressbook_bo
{ {
if ($GLOBALS['egw_info']['user']['preferences']['common']['country']) if ($GLOBALS['egw_info']['user']['preferences']['common']['country'])
{ {
$content['adr_one_countryname'] = $content['adr_one_countrycode'] =
$GLOBALS['egw']->country->get_full_name($GLOBALS['egw_info']['user']['preferences']['common']['country']); $GLOBALS['egw_info']['user']['preferences']['common']['country'];
} }
if ($this->prefs['fileas_default']) $content['fileas_type'] = $this->prefs['fileas_default']; if ($this->prefs['fileas_default']) $content['fileas_type'] = $this->prefs['fileas_default'];
} }