From 5c2d1ad1f5d3243d70ac512265d63965b07ac7bc Mon Sep 17 00:00:00 2001 From: Jon Goldberg Date: Fri, 3 Dec 2021 10:59:11 -0500 Subject: [PATCH] PHP 8 compat - no optional param before required --- CRM/Mailing/Event/BAO/Resubscribe.php | 4 +--- CRM/Mailing/Page/Common.php | 2 +- api/v3/MailingEventResubscribe.php | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CRM/Mailing/Event/BAO/Resubscribe.php b/CRM/Mailing/Event/BAO/Resubscribe.php index 73e15ec35daf..dea877f6a081 100644 --- a/CRM/Mailing/Event/BAO/Resubscribe.php +++ b/CRM/Mailing/Event/BAO/Resubscribe.php @@ -172,12 +172,10 @@ public static function &resub_to_mailing($job_id, $queue_id, $hash) { * The queue event ID. * @param array $groups * List of group IDs. - * @param bool $is_domain - * Is this domain-level?. * @param int $job * The job ID. */ - public static function send_resub_response($queue_id, $groups, $is_domain = FALSE, $job) { + public static function send_resub_response($queue_id, $groups, $job) { // param is_domain is not supported as of now. $config = CRM_Core_Config::singleton(); diff --git a/CRM/Mailing/Page/Common.php b/CRM/Mailing/Page/Common.php index 4bae016690a9..e1d6f05e5f94 100644 --- a/CRM/Mailing/Page/Common.php +++ b/CRM/Mailing/Page/Common.php @@ -79,7 +79,7 @@ public function run() { elseif ($this->_type == 'resubscribe') { $groups = CRM_Mailing_Event_BAO_Resubscribe::resub_to_mailing($job_id, $queue_id, $hash); if (count($groups)) { - CRM_Mailing_Event_BAO_Resubscribe::send_resub_response($queue_id, $groups, FALSE, $job_id); + CRM_Mailing_Event_BAO_Resubscribe::send_resub_response($queue_id, $groups, $job_id); } else { // should we indicate an error, or just ignore? diff --git a/api/v3/MailingEventResubscribe.php b/api/v3/MailingEventResubscribe.php index 7ec13dcbea71..1e5017caa42a 100644 --- a/api/v3/MailingEventResubscribe.php +++ b/api/v3/MailingEventResubscribe.php @@ -35,7 +35,7 @@ function civicrm_api3_mailing_event_resubscribe_create($params) { if (count($groups)) { CRM_Mailing_Event_BAO_Resubscribe::send_resub_response( $params['event_queue_id'], - $groups, FALSE, + $groups, $params['job_id'] ); return civicrm_api3_create_success($params);