Index: user/edit.php
===================================================================
RCS file: /cvsroot/moodle/moodle/user/edit.php,v
retrieving revision 1.167.2.11
diff -u -r1.167.2.11 edit.php
--- user/edit.php	10 Jul 2008 08:05:52 -0000	1.167.2.11
+++ user/edit.php	15 Sep 2008 11:03:23 -0000
@@ -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;