MDL-16308 Use default country instead of empty one when some external auth source (LDAP, POP3 etc) is used. Merged from 1.9

2008-09-25 10:12:18 +00:00
parent 740939ec61
commit 4697304a4c
1 changed files with 4 additions and 0 deletions
@@ -100,6 +100,10 @@

    //create form
    $userform = new user_edit_form();
+    if (empty($user->country)) {
+        // MDL-16308 - we must unset the value here so $CFG->country can be used as default one
+        unset($user->country);
+    }
    $userform->set_data($user);

    $email_changed = false;