Merge pull request #15541 from ixiam/dev_issue#1324

Adds missing join on the customtable of address customfields while exposed as profile
civicrm · Oct 28, 2019 · d2a94fa · d2a94fa
2 parents 73ad832 + 4ad408a
commit d2a94fa
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
@@ -1303,6 +1303,9 @@ public function addHierarchicalElements() {
                   break;
 
                 default:
+                  if (isset($addressCustomFields[$elementName]['custom_field_id']) && !empty($addressCustomFields[$elementName]['custom_field_id'])) {
+                    $this->_tables[$tName] = "\nLEFT JOIN $tableName `$tName` ON `$tName`.id = $aName.id";
+                  }
                   if ($addWhere) {
                     $this->_whereTables["{$name}-address"] = $addressJoin;
                   }