mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 06:30:59 +01:00
Fix smime signed messages contain text/calender no longer are processed as event
This commit is contained in:
parent
efcbdde1a2
commit
cea886fd83
@ -3413,11 +3413,11 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
|
||||
$bodyParts = $this->mail_bo->getMessageBody($uid, ($htmlOptions?$htmlOptions:''), $partID, $structure, false, $mailbox, $calendar_part);
|
||||
|
||||
// for meeting requests (multipart alternative with text/calendar part) let calendar render it
|
||||
if ($calendar_part && isset($GLOBALS['egw_info']['user']['apps']['calendar']) && empty($smime))
|
||||
if ($calendar_part && isset($GLOBALS['egw_info']['user']['apps']['calendar']))
|
||||
{
|
||||
$charset = $calendar_part->getContentTypeParameter('charset');
|
||||
// Do not try to fetch raw part content if it's smime signed message
|
||||
$this->mail_bo->fetchPartContents($uid, $calendar_part);
|
||||
if (empty($smime)) $this->mail_bo->fetchPartContents($uid, $calendar_part);
|
||||
$headers = $this->mail_bo->getHeaders($mailbox, 0, 1, '', false, null, $uid);
|
||||
Api\Cache::setSession('calendar', 'ical', array(
|
||||
'charset' => $charset ?: 'utf-8',
|
||||
|
Loading…
Reference in New Issue
Block a user