summaryrefslogtreecommitdiff
path: root/lib/api/kolab_api_service_form_value.php
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2012-03-16 10:21:05 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2012-03-16 10:21:05 (GMT)
commit867572bdc6476d4fdbfcfc5eb2beddf0f71b909a (patch)
tree2e13baab466d37cd826289f4ba85c7ef9fc3b9d9 /lib/api/kolab_api_service_form_value.php
parent5fcbdd3d9ab8befc8b7b9f97855b2664b6f969a3 (diff)
parent2014254896cdd5578bf5ef6c3ea7ea3c895d836f (diff)
downloadkolab-wap-867572bdc6476d4fdbfcfc5eb2beddf0f71b909a.tar.gz
Merge branch 'master' of ssh://git.kolab.org/git/kolab-wap
Change form_value.list_options to form_value.select_options Conflicts: lib/api/kolab_api_service_form_value.php
Diffstat (limited to 'lib/api/kolab_api_service_form_value.php')
-rw-r--r--lib/api/kolab_api_service_form_value.php12
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/api/kolab_api_service_form_value.php b/lib/api/kolab_api_service_form_value.php
index 061d343..c8bf051 100644
--- a/lib/api/kolab_api_service_form_value.php
+++ b/lib/api/kolab_api_service_form_value.php
@@ -364,12 +364,10 @@ class kolab_api_service_form_value extends kolab_api_service
private function select_options_preferredlanguage($postdata, $attribs = array())
{
- return array(
- 'en_US',
- 'de_DE',
- 'de_CH',
- 'en_GB',
- 'fr_FR',
- );
+ $db = SQL::get_instance();
+ $query = $db->query("SELECT option_values FROM options WHERE attribute = 'preferredlanguage'")
+ $attribute = $db->fetch_assoc($query);
+
+ return json_decode($attribute['option_values']);
}
}