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 29183ea58f8adabaed8b4455ff69fa70ca9ad72e..01fc06f7f6ef557e1f5dcfca5ad759ce9a559b7e 100644 (file)
--- 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;
+      }
     }
   }