Adds missing join on the custom table

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index 6f7cc442d644b31c0a7fe96b26649e3f345aa31d..0776ee72a52ca44c64d7b80b82d6c1d0a1d54422 100644 (file)
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -1303,6 +1303,9 @@ class CRM_Contact_BAO_Query {
                   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;
                   }