From a822d3d8d35e8fc388e98d61c29cad64f766e49d Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Fri, 20 Jun 2014 15:33:30 +1200 Subject: [PATCH] CRM-14887 smart group search regression on location --- CRM/Contact/BAO/Query.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index 25b1aa86ad..42389ce8e2 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -2213,7 +2213,7 @@ class CRM_Contact_BAO_Query { ) )) { //fix for search by profile with address fields. - $tName = "{$locationType[$locType[1]]}_address"; + $tName = "{$locationType[$locType[1]]}-address"; } elseif ($locType[0] == 'on_hold') { $tName = "{$locationType[$locType[1]]}-email"; @@ -2544,11 +2544,11 @@ class CRM_Contact_BAO_Query { continue; default: - if (strpos($name, '_address') != 0) { + if (strpos($name, '-address') != 0) { //we have a join on an address table - possibly in conjunction with search builder - CRM-14263 - $parts = explode('_', $name); + $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 location_type_id = $locationID "; } else { $from .= CRM_Core_Component::from($name, $mode, $side); -- 2.25.1