From 4697304a4c2b2fee22fb496c6ea15e7206852ebc Mon Sep 17 00:00:00 2001
From: mudrd8mz <mudrd8mz>
Date: Thu, 25 Sep 2008 10:12:18 +0000
Subject: [PATCH] MDL-16308 Use default country instead of empty one when some
 external auth source (LDAP, POP3 etc) is used. Merged from 1.9

---
 user/edit.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/user/edit.php b/user/edit.php
index 064fb308fd..7bf8b327ec 100644
--- a/user/edit.php
+++ b/user/edit.php
@@ -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;
-- 
2.39.5