From 9fd71915bb225615622c100e3238e9de4965a558 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Thu, 27 Jun 2013 10:40:36 -0700 Subject: [PATCH] Cleanup --- CRM/Contact/BAO/Query.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index c7401cab2a..756e672c26 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -3526,7 +3526,7 @@ WHERE id IN ( $groupIDs ) $this->_qill[$grouping][] = ts('State/Province') . " $op " . implode(' ' . ts('or') . ' ', $names) . $countryQill; } else { - return implode(' ' . ts('or') . ' ', $names) . $countryQill;; + return implode(' ' . ts('or') . ' ', $names) . $countryQill; } } @@ -3609,10 +3609,8 @@ WHERE id IN ( $groupIDs ) function privacyOptions($values) { list($name, $op, $value, $grouping, $wildcard) = $values; - if (empty($value) || - !is_array($value) - ) { - continue; + if (empty($value) || !is_array($value)) { + return; } // get the operator and toggle values -- 2.25.1