From: Sudha Bisht Date: Fri, 21 Aug 2015 14:29:24 +0000 (+0530) Subject: Warning Fix X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=85609814600ad95c768e1703157a36e97f8ea652;p=civicrm-core.git Warning Fix --- diff --git a/CRM/Campaign/BAO/Query.php b/CRM/Campaign/BAO/Query.php index f38273cfb8..6e25c93252 100755 --- 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 45acb3210e..22388e61a0 100644 --- 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'); } + }