diff options
| -rw-r--r-- | config/main.inc.php.dist | 2 | ||||
| -rw-r--r-- | program/steps/mail/show.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index 15da00d66..597b4685a 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -356,7 +356,7 @@ $rcmail_config['identities_level'] = 0; $rcmail_config['client_mimetypes'] = null; # null == default // mime magic database -$rcmail_config['mime_magic'] = '/usr/share/misc/magic'; +$rcmail_config['mime_magic'] = null; // path to imagemagick identify binary $rcmail_config['im_identify_path'] = null; diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index c6c6d9636..20e76a64b 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -54,7 +54,7 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) { $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'); + $mimetypes = $RCMAIL->config->get('client_mimetypes', 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/x-javascript,application/pdf'); $OUTPUT->set_env('mimetypes', is_string($mimetypes) ? explode(',', $mimetypes) : (array)$mimetypes); if ($CONFIG['drafts_mbox']) |