From 7bbd0c9d730734057251c82175eb991335cc644a Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Thu, 25 Jun 2015 01:10:17 +0000 Subject: [PATCH] Fix Whitespace issues --- CRM/Contact/Form/Search/Custom/PostalMailing.php | 4 ++-- CRM/Contact/Form/Search/Custom/Proximity.php | 4 ++-- CRM/Contact/Form/Search/Custom/RandomSegment.php | 4 ++-- CRM/Contact/Form/Search/Custom/Sample.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CRM/Contact/Form/Search/Custom/PostalMailing.php b/CRM/Contact/Form/Search/Custom/PostalMailing.php index 317cfc05e6..bb26d40c6e 100644 --- a/CRM/Contact/Form/Search/Custom/PostalMailing.php +++ b/CRM/Contact/Form/Search/Custom/PostalMailing.php @@ -147,11 +147,11 @@ LEFT JOIN civicrm_state_province state_province ON state_province.id = address. (select cr.contact_id_b from civicrm_relationship cr where (cr.contact_id_a = cgc.contact_id AND (cr.relationship_type_id = 7 OR cr.relationship_type_id = 6))), cgc.contact_id )"; $clause[] = "contact_a.contact_type IN ('Individual','Household')"; - + if ($this->_aclWhere) { $clause[] = " {$this->_aclWhere} "; } - + if (!empty($clause)) { $where = implode(' AND ', $clause); } diff --git a/CRM/Contact/Form/Search/Custom/Proximity.php b/CRM/Contact/Form/Search/Custom/Proximity.php index 47633813d6..ee97c6c1dc 100644 --- a/CRM/Contact/Form/Search/Custom/Proximity.php +++ b/CRM/Contact/Form/Search/Custom/Proximity.php @@ -253,11 +253,11 @@ AND cgc.group_id = {$this->_group} $where .= " AND contact_a.is_deleted != 1 "; $where .= "{$this->_where}"; - + if ($this->_aclWhere) { $where .= " AND {$this->_aclWhere} "; } - + return $this->whereClause($where, $params); } diff --git a/CRM/Contact/Form/Search/Custom/RandomSegment.php b/CRM/Contact/Form/Search/Custom/RandomSegment.php index 0e972f2404..e9b2a9e9fb 100644 --- a/CRM/Contact/Form/Search/Custom/RandomSegment.php +++ b/CRM/Contact/Form/Search/Custom/RandomSegment.php @@ -342,11 +342,11 @@ class CRM_Contact_Form_Search_Custom_RandomSegment extends CRM_Contact_Form_Sear */ public function where($includeContactIDs = FALSE) { $where = '(1)'; - + if ($this->_aclWhere) { $where = " AND {$this->_aclWhere} "; } - + return '(1)'; } diff --git a/CRM/Contact/Form/Search/Custom/Sample.php b/CRM/Contact/Form/Search/Custom/Sample.php index 6f11d7830f..85ce543136 100644 --- a/CRM/Contact/Form/Search/Custom/Sample.php +++ b/CRM/Contact/Form/Search/Custom/Sample.php @@ -189,7 +189,7 @@ LEFT JOIN civicrm_state_province state_province ON state_province.id = address.s $params[$count] = array($state, 'Integer'); $clause[] = "state_province.id = %{$count}"; } - + if ($this->_aclWhere) { $clause[] = " AND {$this->_aclWhere} "; } -- 2.25.1