From c8d2f535d92e2e2332769aa780df3682b3a12fda Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 24 Jun 2021 14:05:43 +0200 Subject: [PATCH] * Mail/SMIME: fix signed calendar events not being displayed (error:importing the ical!) --- mail/inc/class.mail_ui.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index 7a26604673..90b9528ff7 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -3314,7 +3314,8 @@ $filter['before']= date("d-M-Y", $cutoffdate2); if ($calendar_part && isset($GLOBALS['egw_info']['user']['apps']['calendar'])) { $charset = $calendar_part->getContentTypeParameter('charset'); - $this->mail_bo->fetchPartContents($uid, $calendar_part); + // Do not try to fetch raw part content if it's smime signed message + if (!$smime) $this->mail_bo->fetchPartContents($uid, $calendar_part); Api\Cache::setSession('calendar', 'ical', array( 'charset' => $charset ? $charset : 'utf-8', 'attachment' => $calendar_part->getContents(),