From: jitendrapurohit <jitendra.purohit@webaccessglobal.com>
Date: Wed, 25 Mar 2015 11:57:03 +0000 (+0530)
Subject: CRM-16152 - County is Not Saved When Sharing an Address the First Time
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6617747ff8eab91d6defc8cee03958c34d3e011e;p=civicrm-core.git

CRM-16152 - County is Not Saved When Sharing an Address the First Time
---

diff --git a/CRM/Contact/BAO/Contact/Utils.php b/CRM/Contact/BAO/Contact/Utils.php
index 29183ea58f..01fc06f7f6 100644
--- a/CRM/Contact/BAO/Contact/Utils.php
+++ b/CRM/Contact/BAO/Contact/Utils.php
@@ -854,6 +854,12 @@ Group By  componentId";
           }
         }
       }
+
+      //5. modify the params to include county_id if it exist in master contact.
+      // CRM-16152: This is a hack since QF does not submit disabled field.
+      if (!empty($masterAddress->county_id) && empty($values['county_id'])) {
+        $values['county_id'] = $masterAddress->county_id;
+      }
     }
   }