summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/libcalendaring/libcalendaring.php3
-rw-r--r--plugins/odfviewer/odfviewer.php4
2 files changed, 2 insertions, 5 deletions
diff --git a/plugins/libcalendaring/libcalendaring.php b/plugins/libcalendaring/libcalendaring.php
index de2d75f..fcbce27 100644
--- a/plugins/libcalendaring/libcalendaring.php
+++ b/plugins/libcalendaring/libcalendaring.php
@@ -165,8 +165,7 @@ class libcalendaring extends rcube_plugin
// define list of file types which can be displayed inline
// same as in program/steps/mail/show.inc
- $mimetypes = $this->rc->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');
- $settings['mimetypes'] = is_string($mimetypes) ? explode(',', $mimetypes) : (array)$mimetypes;
+ $settings['mimetypes'] = (array)$this->rc->config->get('client_mimetypes');
return $settings;
}
diff --git a/plugins/odfviewer/odfviewer.php b/plugins/odfviewer/odfviewer.php
index da96747..950b2dd 100644
--- a/plugins/odfviewer/odfviewer.php
+++ b/plugins/odfviewer/odfviewer.php
@@ -59,9 +59,7 @@ class odfviewer extends rcube_plugin
// extend list of mimetypes that should open in preview
$rcmail = rcube::get_instance();
if ($rcmail->action == 'preview' || $rcmail->action == 'show' || $rcmail->task == 'calendar' || $rcmail->task == 'tasks') {
- $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');
- if (!is_array($mimetypes))
- $mimetypes = explode(',', $mimetypes);
+ $mimetypes = (array)$rcmail->config->get('client_mimetypes');
$rcmail->config->set('client_mimetypes', array_merge($mimetypes, $this->odf_mimetypes));
}