diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-01-15 18:18:11 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-01-17 08:38:40 +0100 |
| commit | a03c28a22f194c3cbaee46abd8def0d7b8fa7e60 (patch) | |
| tree | b90ec6cb175833b3dcaf14a548bca5566e7cdad1 | |
| parent | 2080feca9367c057590835df12f5ebe6da8c1e9c (diff) | |
Make sure mimetypes is an array not object in a better way
| -rw-r--r-- | program/js/app.js | 2 | ||||
| -rw-r--r-- | program/steps/mail/show.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/program/js/app.js b/program/js/app.js index 6f45cd045..632ee964c 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -820,7 +820,7 @@ function rcube_webmail() var qstring = '_mbox='+urlencode(this.env.mailbox)+'&_uid='+this.env.uid+'&_part='+props.part; // open attachment in frame if it's of a supported mimetype - if (this.env.uid && props.mimetype && this.env.mimetypes && $.inArray(props.mimetype, $.map(this.env.mimetypes, function(v,k){ return v })) >= 0) { + if (this.env.uid && props.mimetype && this.env.mimetypes && $.inArray(props.mimetype, this.env.mimetypes) >= 0) { if (props.mimetype == 'text/html') qstring += '&_safe=1'; this.attachment_win = window.open(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1', 'rcubemailattachment'); diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index 64e628880..3495df9c0 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -79,7 +79,7 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) { } } - $OUTPUT->set_env('mimetypes', $mimetypes); + $OUTPUT->set_env('mimetypes', array_values($mimetypes)); if ($CONFIG['drafts_mbox']) $OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']); |