From b3071092afcdebc23ce5bc8fe9e08d1fff94d415 Mon Sep 17 00:00:00 2001
From: "Donald A. Lobo" <lobo@civicrm.org>
Date: Fri, 25 Oct 2013 09:17:56 -0700
Subject: [PATCH] Fix notice reported via forums

---
 CRM/Core/BAO/UFGroup.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CRM/Core/BAO/UFGroup.php b/CRM/Core/BAO/UFGroup.php
index b449f454e0..29bbb34daf 100644
--- a/CRM/Core/BAO/UFGroup.php
+++ b/CRM/Core/BAO/UFGroup.php
@@ -2367,13 +2367,15 @@ AND    ( entity_id IS NULL OR entity_id <= 0 )
                         $defaults[$fldName] = $value['county_id'];
                       }
                       elseif ($fieldName == 'country') {
-                        $defaults[$fldName] = $value['country_id'];
                         if (!isset($value['country_id']) || !$value['country_id']) {
                           $config = CRM_Core_Config::singleton();
                           if ($config->defaultContactCountry) {
                             $defaults[$fldName] = $config->defaultContactCountry;
                           }
                         }
+                        else {
+                          $defaults[$fldName] = $value['country_id'];
+                        }
                       }
                       elseif ($fieldName == 'phone') {
                         if ($phoneTypeId) {
-- 
2.25.1