CRM-14887 further fix on table
authorEileen McNaughton <eileen@fuzion.co.nz>
Fri, 20 Jun 2014 03:43:56 +0000 (15:43 +1200)
committerEileen McNaughton <eileen@fuzion.co.nz>
Fri, 20 Jun 2014 03:43:56 +0000 (15:43 +1200)
CRM/Contact/BAO/Query.php

index 42389ce8e2a7b4bd6a7b8116e929282fa8093432..eb8a2e1f7e218560f111d78cbae209ee5cbfe1e4 100644 (file)
@@ -2548,7 +2548,7 @@ class CRM_Contact_BAO_Query {
             //we have a join on an address table - possibly in conjunction with search builder - CRM-14263
             $parts = explode('-', $name);
             $locationID = array_search($parts[0], CRM_Core_BAO_Address::buildOptions('location_type_id', 'get', array('name' => $parts[0])));
-            $from .= " $side JOIN civicrm_address `{$name}` ON ( contact_a.id = `{$name}`.contact_id ) and location_type_id = $locationID ";
+            $from .= " $side JOIN civicrm_address `{$name}` ON ( contact_a.id = `{$name}`.contact_id ) and `{$name}`.location_type_id = $locationID ";
           }
           else {
             $from .= CRM_Core_Component::from($name, $mode, $side);