Minor fix

diff --git a/CRM/Campaign/BAO/Query.php b/CRM/Campaign/BAO/Query.php
index 79c023a252f54f2f2c8a51948dae4b5183d0be52..f38273cfb8126908a4b960beaeda82f1c25444b4 100755 (executable)
--- 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 2bb55c86abe49aa3e4dc05eeed7d2eda6da38d03..45acb3210ef676b581aaed829121528c0b862a44 100644 (file)
--- 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');
   }
 }