summaryrefslogtreecommitdiffstats
path: root/application/config
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-11-23 12:25:52 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-11-23 12:25:52 +0100
commitb8188f6a588fbf2a4b9570580999317ba149ecb0 (patch)
tree0205671d3f53c6253ecbbb676ccf6c3044597889 /application/config
parent0199f68db46d375af2d4cb831c679d3040601f25 (diff)
parent8ed78098369cd445bae796d0cd31b34cbc02585a (diff)
Merge pull request #697 from MVUG/upload-fixes-2.1
Fixed bug in Upload library tmp_path does not exists, should be tmp_name.
Diffstat (limited to 'application/config')
-rw-r--r--application/config/mimes.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index f00e5b6ed..100f7d442 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -93,8 +93,8 @@ $mimes = array( 'hqx' => 'application/mac-binhex40',
'avi' => 'video/x-msvideo',
'movie' => 'video/x-sgi-movie',
'doc' => 'application/msword',
- 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
- 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+ 'docx' => array('application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/zip'),
+ 'xlsx' => array('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/zip'),
'word' => array('application/msword', 'application/octet-stream'),
'xl' => 'application/excel',
'eml' => 'message/rfc822',