MDL-9467 workaround for broken langcache problems when editting user profile; merged...

diff --git a/user/editlib.php b/user/editlib.php
index 4a8ce73db3cbd40b8a9e0cca6f5ade3702a4bcae..078f1df03b7f4887ef302ee4b9422eb8b91d8230 100644 (file)
--- a/user/editlib.php
+++ b/user/editlib.php
@@ -177,11 +177,8 @@ function useredit_shared_definition(&$mform) {
         $mform->setDefault('timezone', '99');
     }
 
-    $choices = array();
-    if ($choices = get_list_of_languages()) {
-        $mform->addElement('select', 'lang', get_string('preferredlanguage'), $choices);
-        $mform->setDefault('lang', $CFG->lang);
-    }
+    $mform->addElement('select', 'lang', get_string('preferredlanguage'), get_list_of_languages());
+    $mform->setDefault('lang', $CFG->lang);
 
     if (!empty($CFG->allowuserthemes)) {
         $choices = array();