From 9a17729c550eff503275b4acc1fe3127506e1f9d Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Fri, 11 Feb 2022 15:31:06 +1300 Subject: [PATCH] BAO_Mailing::create - stop passing by reference We have been removing this pass-by-refs on an ongoing basis. CRUD calls should use the api but I checked the core calls and none are looking for anything altered in --- CRM/Mailing/BAO/Mailing.php | 2 +- CRM/Mailing/BAO/Spool.php | 3 +-- CRM/Mailing/Form/Approve.php | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php index 158d6f0e37..9c34ceebc6 100644 --- a/CRM/Mailing/BAO/Mailing.php +++ b/CRM/Mailing/BAO/Mailing.php @@ -1470,7 +1470,7 @@ ORDER BY civicrm_email.is_bulkmail DESC * @throws \CRM_Core_Exception * @throws \CiviCRM_API3_Exception */ - public static function create(&$params) { + public static function create(array $params) { // CRM-#1843 // If it is a mass sms, set url_tracking to false diff --git a/CRM/Mailing/BAO/Spool.php b/CRM/Mailing/BAO/Spool.php index dc88a6fc7a..b4f3a83bfe 100644 --- a/CRM/Mailing/BAO/Spool.php +++ b/CRM/Mailing/BAO/Spool.php @@ -57,8 +57,7 @@ class CRM_Mailing_BAO_Spool extends CRM_Mailing_DAO_Spool { $params['body_html'] = htmlspecialchars($headerStr) . "\n\n" . $body; $params['subject'] = $headers['Subject']; $params['name'] = $headers['Subject']; - $ids = []; - $mailing = CRM_Mailing_BAO_Mailing::create($params, $ids); + $mailing = CRM_Mailing_BAO_Mailing::create($params); if (empty($mailing) || is_a($mailing, 'CRM_Core_Error')) { return PEAR::raiseError('Unable to create spooled mailing.'); diff --git a/CRM/Mailing/Form/Approve.php b/CRM/Mailing/Form/Approve.php index ac554fae91..ff5c6ddfe2 100644 --- a/CRM/Mailing/Form/Approve.php +++ b/CRM/Mailing/Form/Approve.php @@ -167,7 +167,7 @@ class CRM_Mailing_Form_Approve extends CRM_Core_Form { $params['scheduled_date'] = CRM_Utils_Date::processDate($mailing->scheduled_date); } - CRM_Mailing_BAO_Mailing::create($params, $ids); + CRM_Mailing_BAO_Mailing::create($params); //when user perform mailing from search context //redirect it to search result CRM-3711 -- 2.25.1