From 19b4cf034f2a75de42f28eaddcd74e0181043dae Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Fri, 8 Oct 2021 13:05:06 +0200 Subject: [PATCH] Revert strict comparison on mimeType --- mail/inc/class.mail_compose.inc.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php index c485255826..164f538b80 100644 --- a/mail/inc/class.mail_compose.inc.php +++ b/mail/inc/class.mail_compose.inc.php @@ -1329,7 +1329,7 @@ class mail_compose $etpl = new Etemplate('mail.compose'); $etpl->setElementAttribute('composeToolbar', 'actions', self::getToolbarActions($content)); - if ($content['mimeType'] === 'html') + if ($content['mimeType'] == 'html') { //mode="$cont[rtfEditorFeatures]" validation_rules="$cont[validation_rules]" base_href="$cont[upload_dir]" $_htmlConfig = Mail::$htmLawed_config; @@ -1364,7 +1364,7 @@ class mail_compose $preserv['list-id'] = $content['list-id'] ?? null; $preserv['mode'] = $content['mode'] ?? null; // convert it back to checkbox expectations - if($content['mimeType'] === 'html') { + if($content['mimeType'] == 'html') { $content['mimeType']=1; } else { $content['mimeType']=0; @@ -2522,7 +2522,9 @@ class mail_compose if ($_formData['attachments'] && $_formData['filemode'] != Vfs\Sharing::ATTACH && !$_autosaving) { $attachment_links = $this->_getAttachmentLinks($_formData['attachments'], $_formData['filemode'], - $_formData['mimeType'] === 'html', + // @TODO: $content['mimeType'] could type string/boolean. At the moment we can't strictly check them :(. + // @TODO: This needs to be fixed in compose function to get the right type from the content. + $_formData['mimeType'] == 'html', array_unique(array_merge((array)$_formData['to'], (array)$_formData['cc'], (array)$_formData['bcc'])), $_formData['expiration'], $_formData['password']); }