From 4a10f682f6b5f7ca06612cdad7846d59d2ff8b37 Mon Sep 17 00:00:00 2001 From: Mathieu Lutfy Date: Sat, 19 Feb 2022 16:40:29 -0500 Subject: [PATCH] Mailing Report: do not recalculate the recipients when the count is zero --- CRM/Mailing/BAO/Mailing.php | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php index 93592c8e01..f1b62a449a 100644 --- a/CRM/Mailing/BAO/Mailing.php +++ b/CRM/Mailing/BAO/Mailing.php @@ -82,20 +82,6 @@ class CRM_Mailing_BAO_Mailing extends CRM_Mailing_DAO_Mailing { */ private $_domain = NULL; - /** - * @deprecated - * - * @param int $mailingID - * - * @return int - */ - public static function getRecipientsCount($mailingID) { - //rebuild the recipients - self::getRecipients($mailingID); - - return civicrm_api3('MailingRecipients', 'getcount', ['mailing_id' => $mailingID]); - } - /** * This function retrieve recipients of selected mailing groups. * @@ -2032,16 +2018,7 @@ ORDER BY civicrm_email.is_bulkmail DESC $report['jobs'][] = $row; } - $newTableSize = CRM_Mailing_BAO_Recipients::mailingSize($mailing_id); - - // we need to do this for backward compatibility, since old mailings did not - // use the mailing_recipients table - if ($newTableSize > 0) { - $report['event_totals']['queue'] = $newTableSize; - } - else { - $report['event_totals']['queue'] = self::getRecipientsCount($mailing_id); - } + $report['event_totals']['queue'] = CRM_Mailing_BAO_Recipients::mailingSize($mailing_id); if (!empty($report['event_totals']['queue'])) { $report['event_totals']['delivered_rate'] = (100.0 * $report['event_totals']['delivered']) / $report['event_totals']['queue']; -- 2.25.1