From fd371a519d64bbcf6d35288e532dc2179ff1e462 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 29 Nov 2010 04:54:15 -0500
Subject: [PATCH] - Fix attachments of type message/rfc822 are not listed on attachments list
---
CHANGELOG | 1 +
program/include/rcube_message.php | 6 +++++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 555fdfc..d9c978d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
===========================
- Plugin API: Add 'pass' argument in 'authenticate' hook (#1487134)
+- Fix attachments of type message/rfc822 are not listed on attachments list
RELEASE 0.5-BETA
----------------
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 790f8d9..b6c865d 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -426,7 +426,7 @@
$mail_part->type = 'content';
$this->parts[] = $mail_part;
}
-
+
// list as attachment as well
if (!empty($mail_part->filename))
$this->attachments[] = $mail_part;
@@ -473,6 +473,10 @@
// attachment encapsulated within message/rfc822 part needs further decoding (#1486743)
else if ($part_orig_mimetype == 'message/rfc822') {
$this->parse_structure($mail_part, true);
+
+ // list as attachment as well (mostly .eml)
+ if (!empty($mail_part->filename))
+ $this->attachments[] = $mail_part;
}
// is a regular attachment (content-type name regexp according to RFC4288.4.2)
else if (preg_match('/^[a-z0-9!#$&.+^_-]+\/[a-z0-9!#$&.+^_-]+$/i', $part_mimetype)) {
--
Gitblit v1.9.1