summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-08-30 09:58:19 +0200
committerAndrey Andreev <narf@devilix.net>2016-08-30 09:58:59 +0200
commita70b9614e71c0060700ab99bfa752fa2b9fafaed (patch)
tree19356a14622efeaa514ef531c6e5b9ff2c4f9cb6
parent0abc0dfca3c4e9e17da07edc864e009c13222174 (diff)
Merge pull request #4788 from edtsz/patch-2
Add OpenOffice mime-types to config/mimes.php
-rw-r--r--application/config/mimes.php18
1 files changed, 17 insertions, 1 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index 8bac87251..017653335 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -163,5 +163,21 @@ return array(
'vcf' => 'text/x-vcard',
'srt' => array('text/srt', 'text/plain'),
'vtt' => array('text/vtt', 'text/plain'),
- 'ico' => array('image/x-icon', 'image/x-ico', 'image/vnd.microsoft.icon')
+ 'ico' => array('image/x-icon', 'image/x-ico', 'image/vnd.microsoft.icon'),
+ 'odc' => 'application/vnd.oasis.opendocument.chart',
+ 'otc' => 'application/vnd.oasis.opendocument.chart-template',
+ 'odf' => 'application/vnd.oasis.opendocument.formula',
+ 'otf' => 'application/vnd.oasis.opendocument.formula-template',
+ 'odg' => 'application/vnd.oasis.opendocument.graphics',
+ 'otg' => 'application/vnd.oasis.opendocument.graphics-template',
+ 'odi' => 'application/vnd.oasis.opendocument.image',
+ 'oti' => 'application/vnd.oasis.opendocument.image-template',
+ 'odp' => 'application/vnd.oasis.opendocument.presentation',
+ 'otp' => 'application/vnd.oasis.opendocument.presentation-template',
+ 'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+ 'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
+ 'odt' => 'application/vnd.oasis.opendocument.text',
+ 'odm' => 'application/vnd.oasis.opendocument.text-master',
+ 'ott' => 'application/vnd.oasis.opendocument.text-template',
+ 'oth' => 'application/vnd.oasis.opendocument.text-web'
);