Warning Fix

diff --git a/CRM/Campaign/BAO/Query.php b/CRM/Campaign/BAO/Query.php
index f38273cfb8126908a4b960beaeda82f1c25444b4..6e25c93252816ff7c6998ff662917aabf586a247 100755 (executable)
--- a/CRM/Campaign/BAO/Query.php
+++ b/CRM/Campaign/BAO/Query.php
@@ -603,6 +603,7 @@ INNER JOIN  civicrm_custom_group grp on fld.custom_group_id = grp.id
         $campaignIds[$campId] = $campId;
         $campaignTitles[$campId] = $allCampaigns[$campId];
       }
+      $op = 'IN';
     }
     else {
       $campaignIds = $campaign;

diff --git a/tests/phpunit/WebTest/Campaign/MailingTest.php b/tests/phpunit/WebTest/Campaign/MailingTest.php
index 45acb3210ef676b581aaed829121528c0b862a44..22388e61a0bf1707e1b96237f764934f50b28a0f 100644 (file)
--- a/tests/phpunit/WebTest/Campaign/MailingTest.php
+++ b/tests/phpunit/WebTest/Campaign/MailingTest.php
@@ -266,8 +266,7 @@ class WebTest_Campaign_MailingTest extends CiviSeleniumTestCase {
     $this->mailingCampaignAdvancedSearchTest($campaignTitle, $this->_contactNames);
   }
 
-
-  function mailingCampaignAdvancedSearchTest($campaignTitle, $contactNames) {
+  public function mailingCampaignAdvancedSearchTest($campaignTitle, $contactNames) {
     // Go directly to Advanced Search
     $this->openCiviPage('contact/search/advanced', 'reset=1');
 
@@ -280,4 +279,5 @@ class WebTest_Campaign_MailingTest extends CiviSeleniumTestCase {
     $this->waitForElementPresent('search-status');
     $this->assertElementContainsText('search-status', '2 Contacts');
   }
+
 }