From 5264534c46abdd2405da6f20fea111b13565f39d Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sun, 30 Aug 2020 10:56:13 +0200 Subject: [PATCH] Fix bug where some parts of a message could have been missing in a reply/forward body (#7568) --- CHANGELOG | 1 + program/lib/Roundcube/rcube_message.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 41a66876403..713f84bcadf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -51,6 +51,7 @@ CHANGELOG Roundcube Webmail - Fix jstz.min.js installation, bump version to 1.0.7 - Fix link to closure compiler in bin/jsshrink.sh script (#7567) - Fix incorrect PDO::lastInsertId() use in sqlsrv driver (#7564) +- Fix bug where some parts of a message could have been missing in a reply/forward body (#7568) RELEASE 1.4.8 ------------- diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php index 79da019f560..2a0b9916421 100644 --- a/program/lib/Roundcube/rcube_message.php +++ b/program/lib/Roundcube/rcube_message.php @@ -531,7 +531,7 @@ public function mime_parts() public function is_attachment($part) { foreach ($this->attachments as $att_part) { - if ($att_part->mime_id == $part->mime_id) { + if ($att_part->mime_id === $part->mime_id) { return true; } @@ -586,7 +586,7 @@ private function parse_structure($structure, $recursive = false) list($headers, $body) = explode("\r\n\r\n", $this->get_part_body($structure->mime_id, false, 32768)); $structure->headers = rcube_mime::parse_headers($headers); - if ($this->context == $structure->mime_id) { + if ($this->context === $structure->mime_id) { $this->headers = rcube_message_header::from_array($structure->headers); }