summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2015-02-20 05:33:51 -0500
committerAleksander Machniak <alec@alec.pl>2015-02-20 05:33:51 -0500
commit3ab1b1a6ba4f1f076f1e095bfecfc54054aaf935 (patch)
tree833753986fd29df0ea75cd9b929dcdc4b801640a
parent3f308bf3903a71d078e6080773b8b554ba1fb478 (diff)
parent45256e8293d04203a3b0952792f8bb2de768390b (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
-rw-r--r--program/steps/mail/get.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 02ec5a4ac..5803e0c5a 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -164,7 +164,7 @@ else if (strlen($part_id)) {
else {
// get valid file extensions
$extensions = rcube_mime::get_mime_extensions($real_mimetype);
- $valid_extension = !$file_extension || in_array($file_extension, (array)$extensions);
+ $valid_extension = !$file_extension || empty($extensions) || in_array($file_extension, (array)$extensions);
}
// fix mimetype for images wrongly declared as octet-stream