Move default value for client_mimetypes to rcube_config; make sure an array is returned

1 files changed, 8 insertions, 1 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));