summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-04-08 13:52:13 +0200
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-04-08 13:52:13 +0200
commitedf09ae570e8adf804154794a9fc86f8f050a864 (patch)
tree2cdcd9015c2be88419b1ee83a9037580966ffb6f
parent57f1e4019bac0cad4b82fed79f51b59af88e3136 (diff)
downloadwebadmin-edf09ae570e8adf804154794a9fc86f8f050a864.tar.gz
Do not just insert the default_locale as the default value for the preferredlanguage select list, take into account the object may already have a preferredlanguage set
-rw-r--r--lib/api/kolab_api_service_form_value.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/api/kolab_api_service_form_value.php b/lib/api/kolab_api_service_form_value.php
index 300da36..694a1d8 100644
--- a/lib/api/kolab_api_service_form_value.php
+++ b/lib/api/kolab_api_service_form_value.php
@@ -659,6 +659,10 @@ class kolab_api_service_form_value extends kolab_api_service
$default = 'en_US';
}
+ if (!empty($postdata['preferredlanguage'])) {
+ $default = $postdata['preferredlanguage'];
+ }
+
$options['default'] = $default;
return $options;