From 84f2017c52db46af0afc98b05d2ce6814636220b Mon Sep 17 00:00:00 2001 From: Bradley Taylor Date: Mon, 29 Aug 2022 11:09:32 +0100 Subject: [PATCH] Tidy up whereClause method of mailing browse --- CRM/Mailing/Page/Browse.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/CRM/Mailing/Page/Browse.php b/CRM/Mailing/Page/Browse.php index 74f1d3ff4f..76d97ad3b1 100644 --- a/CRM/Mailing/Page/Browse.php +++ b/CRM/Mailing/Page/Browse.php @@ -283,7 +283,7 @@ class CRM_Mailing_Page_Browse extends CRM_Core_Page { $url = CRM_Utils_System::url($urlString, $urlParams); $session->pushUserContext($url); - // CRM-6862 -run form cotroller after + // CRM-6862 -run form controller after // selector, since it erase $_POST $this->search(); @@ -315,11 +315,8 @@ class CRM_Mailing_Page_Browse extends CRM_Core_Page { * @return string */ public function whereClause(&$params, $sortBy = TRUE) { - $values = []; - $clauses = []; $title = $this->get('mailing_name'); - // echo " name=$title "; if ($title) { $clauses[] = 'name LIKE %1'; if (strpos($title, '%') !== FALSE) { @@ -336,12 +333,12 @@ class CRM_Mailing_Page_Browse extends CRM_Core_Page { $clauses[] = "name LIKE '" . strtolower(CRM_Core_DAO::escapeWildCardString($this->_sortByCharacter)) . "%'"; } - $campainIds = $this->get('campaign_id'); - if (!CRM_Utils_System::isNull($campainIds)) { - if (!is_array($campainIds)) { + $campaignIds = $this->get('campaign_id'); + if (!CRM_Utils_System::isNull($campaignIds)) { + if (!is_array($campaignIds)) { $campaignIds = [$campaignIds]; } - $clauses[] = '( campaign_id IN ( ' . implode(' , ', array_values($campainIds)) . ' ) )'; + $clauses[] = '( campaign_id IN ( ' . implode(' , ', array_values($campaignIds)) . ' ) )'; } return implode(' AND ', $clauses); -- 2.25.1