diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-11-17 16:59:49 +0100 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-11-17 16:59:49 +0100 |
| commit | 8fb4f05725b90bee03aaf284adb21818789a15c0 (patch) | |
| tree | b599e17c6aff8075fb18dcc8862ab4cfe8cf1073 | |
| parent | 6ddb16d181e285d4f0ef0ef55bdd0ba787f1b583 (diff) | |
Move default value for client_mimetypes to rcube_config; make sure an array is returned
| -rw-r--r-- | program/include/rcube_config.php | 9 | ||||
| -rw-r--r-- | program/steps/mail/show.inc | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php index dab539412..7d206ffdc 100644 --- a/program/include/rcube_config.php +++ b/program/include/rcube_config.php @@ -207,8 +207,15 @@ class rcube_config $rcube = rcube::get_instance(); - if ($name == 'timezone' && isset($this->prop['_timezone_value'])) + if ($name == 'timezone' && isset($this->prop['_timezone_value'])) { $result = $this->prop['_timezone_value']; + } + else if ($name == 'client_mimetypes') { + if ($result == null && $def == null) + $result = 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,image/bmp,image/tiff,application/x-javascript,application/pdf,application/x-shockwave-flash'; + if ($result && is_string($result)) + $result = explode(',', $result); + } $plugin = $rcube->plugins->exec_hook('config_get', array( 'name' => $name, 'default' => $def, 'result' => $result)); diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index f89660719..82594f3e4 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -62,8 +62,7 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) { $OUTPUT->set_env('compose_extwin', $RCMAIL->config->get('compose_extwin',false)); // 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,image/bmp,image/tiff,application/x-javascript,application/pdf,application/x-shockwave-flash'); - $mimetypes = is_string($mimetypes) ? explode(',', $mimetypes) : (array)$mimetypes; + $mimetypes = (array)$RCMAIL->config->get('client_mimetypes'); // Remove unsupported types, which makes that attachment which cannot be // displayed in a browser will be downloaded directly without displaying an overlay page |