From 9773de0aca70593c27ed4ddbcc7be0625ad7a6a2 Mon Sep 17 00:00:00 2001 From: Sudha Bisht Date: Tue, 29 Sep 2015 12:39:13 +0530 Subject: [PATCH] Minor fix --- CRM/Campaign/BAO/Query.php | 7 ------- tests/phpunit/WebTest/Campaign/MailingTest.php | 6 ++---- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/CRM/Campaign/BAO/Query.php b/CRM/Campaign/BAO/Query.php index 79c023a252..f38273cfb8 100755 --- a/CRM/Campaign/BAO/Query.php +++ b/CRM/Campaign/BAO/Query.php @@ -603,13 +603,6 @@ INNER JOIN civicrm_custom_group grp on fld.custom_group_id = grp.id $campaignIds[$campId] = $campId; $campaignTitles[$campId] = $allCampaigns[$campId]; } - if (count($campaignIds) > 1) { - $op = 'IN'; - $campaignIds = '(' . implode(',', $campaignIds) . ')'; - } - else { - $campaignIds = reset($campaignIds); - } } else { $campaignIds = $campaign; diff --git a/tests/phpunit/WebTest/Campaign/MailingTest.php b/tests/phpunit/WebTest/Campaign/MailingTest.php index 2bb55c86ab..45acb3210e 100644 --- a/tests/phpunit/WebTest/Campaign/MailingTest.php +++ b/tests/phpunit/WebTest/Campaign/MailingTest.php @@ -275,11 +275,9 @@ class WebTest_Campaign_MailingTest extends CiviSeleniumTestCase { $this->clickAjaxLink("CiviMail", 'campaigns'); $this->multiselect2("campaigns", array("$campaignTitle")); $this->click("_qf_Advanced_refresh"); - $this->waitForPageToLoad($this->getTimeoutMsec()); // Check for contacts inserted while adding Campaing and Mailing - foreach ($contactNames as $ctKey => $contact) { - $this->assertTrue($this->isTextPresent("$contact")); - } + $this->waitForElementPresent('search-status'); + $this->assertElementContainsText('search-status', '2 Contacts'); } } -- 2.25.1