From 98e4614b0da073b04ba54bfee1df3491dcea6762 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 06 Apr 2015 07:10:06 -0400
Subject: [PATCH] Fix so text/calendar parts are listed as attachments even if not marked as such (#1490325)
---
CHANGELOG | 1 +
program/lib/Roundcube/rcube_message.php | 8 ++++++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 9b89a46..216a29b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@
- Fix PHP warning: Non-static method PEAR::setErrorHandling() should not be called statically (#1490343)
- Fix tables listing routine on mysql and postgres so it skips system or other database tables and views (#1490337)
- Fix message list header in classic skin on window resize in Internet Explorer (#1490213)
+- Fix so text/calendar parts are listed as attachments even if not marked as such (#1490325)
RELEASE 1.1.1
-------------
diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php
index b135ae0..449a3c3 100644
--- a/program/lib/Roundcube/rcube_message.php
+++ b/program/lib/Roundcube/rcube_message.php
@@ -791,6 +791,14 @@
else if ($mail_part->mimetype == 'message/rfc822') {
$this->parse_structure($mail_part);
}
+ // calendar part not marked as attachment (#1490325)
+ else if ($part_mimetype == 'text/calendar') {
+ if (!$mail_part->filename) {
+ $mail_part->filename = 'calendar.ics';
+ }
+
+ $this->attachments[] = $mail_part;
+ }
}
// if this was a related part try to resolve references
--
Gitblit v1.9.1