summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-04-23 13:05:21 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-04-23 13:05:21 +0000
commit5fec343b0a7819e9f1ad4654d9c8e9c8bd2694d8 (patch)
treeee5136c2b7a57c57a0d84747e55d1212b1dc1c96
parentb94a82e5da0733183d0217b65b5a3f89939365c7 (diff)
- Fix listing of attachments of some types e.g. "x-epoc/x-sisx-app" (#1486653)
git-svn-id: https://svn.roundcube.net/trunk@3557 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/CHANGELOG5
-rw-r--r--roundcubemail/program/include/rcube_message.php2
2 files changed, 6 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index f22025fb8..b1b053bca 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,11 @@
CHANGELOG RoundCube Webmail
===========================
+- Fix listing of attachments of some types e.g. "x-epoc/x-sisx-app" (#1486653)
+- Fix DB Schema checking when some db_table_* options are not set (#1486654)
+
+RELEASE 0.4-beta
+----------------
- Add sizelimit and timelimit variables in LDAP config (#1486544)
- Hide IMAP host dropdown when single host is defined (#1486326)
- Add images pre-loading on login page (#1451160)
diff --git a/roundcubemail/program/include/rcube_message.php b/roundcubemail/program/include/rcube_message.php
index fd7a970d3..8cb7b02ab 100644
--- a/roundcubemail/program/include/rcube_message.php
+++ b/roundcubemail/program/include/rcube_message.php
@@ -422,7 +422,7 @@ class rcube_message
$this->inline_parts[] = $mail_part;
}
// is a regular attachment
- else if (preg_match('!^[a-z]+/[a-z0-9-.+]+$!i', $part_mimetype)) {
+ else if (preg_match('!^[a-z0-9-.+]+/[a-z0-9-.+]+$!i', $part_mimetype)) {
if (!$mail_part->filename)
$mail_part->filename = 'Part '.$mail_part->mime_id;
$this->attachments[] = $mail_part;