diff options
| author | alecpl <alec@alec.pl> | 2011-08-31 12:49:44 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-08-31 12:49:44 +0000 |
| commit | b08caf5813c43e8648cdf5db1e003b3046a37c2c (patch) | |
| tree | e87f3c8cd0802c550459f26de1473bbcd4107131 /program/steps/mail/show.inc | |
| parent | fd6146b6780c526a04682cda89b133e2d9bbd910 (diff) | |
- Applied fixes from trunk up to r5150
Diffstat (limited to 'program/steps/mail/show.inc')
| -rw-r--r-- | program/steps/mail/show.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index 3c2fa238e..1472a9e61 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -52,6 +52,10 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) { $OUTPUT->set_env('delimiter', $IMAP->get_hierarchy_delimiter()); $OUTPUT->set_env('mailbox', $mbox_name); + // mimetypes supported by the browser (default settings) + $mimetypes = $RCMAIL->config->get('client_mimetypes', 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/x-javascript,application/pdf,application/x-shockwave-flash'); + $OUTPUT->set_env('mimetypes', is_string($mimetypes) ? explode(',', $mimetypes) : (array)$mimetypes); + if ($CONFIG['trash_mbox']) $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']); if ($CONFIG['flag_for_deletion']) |