From 60a3cf2327e372c3f76c642b64d5c9b5b7af7c0f Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Mon, 20 Nov 2023 22:12:43 +0100 Subject: [PATCH] Fix number of recipients listing mailings --- galette/lib/Galette/Core/MailingHistory.php | 7 +++++++ galette/templates/default/pages/mailings_list.html.twig | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/galette/lib/Galette/Core/MailingHistory.php b/galette/lib/Galette/Core/MailingHistory.php index 49048d09e..fc1f40927 100644 --- a/galette/lib/Galette/Core/MailingHistory.php +++ b/galette/lib/Galette/Core/MailingHistory.php @@ -122,6 +122,13 @@ class MailingHistory extends History = Adherent::getSName($this->zdb, $r['mailing_sender']); } + $recipients = []; + if ($r['mailing_recipients'] != null) { + //FIXME: error suppression with @ must be removed, see https://bugs.galette.eu/issues/1744 + $recipients = @unserialize($r['mailing_recipients']); + } + $r['mailing_recipients'] = $recipients; + $attachments = 0; if (file_exists(GALETTE_ATTACHMENTS_PATH . $r[self::PK])) { $rdi = new \RecursiveDirectoryIterator( diff --git a/galette/templates/default/pages/mailings_list.html.twig b/galette/templates/default/pages/mailings_list.html.twig index 65b6b4b48..99b34f424 100644 --- a/galette/templates/default/pages/mailings_list.html.twig +++ b/galette/templates/default/pages/mailings_list.html.twig @@ -124,7 +124,7 @@ {{ log.mailing_date|date(date_format) }} {% if log.mailing_sender == 0 %}{{ _T('Superadmin') }}{% else %}{{ log.mailing_sender_name }}{% endif %} - {{ log.mailing_recipients[2:2]|first }} + {{ log.mailing_recipients|length }} {{ log.mailing_subject }} {{ log.attachments }} -- 2.39.2