diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-02-29 14:33:28 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-02-29 14:33:28 +0100 |
| commit | a5a2cfef881f4cb70729b854e2e86932f28c43f6 (patch) | |
| tree | de099e40accdba7d9917a2215d2b4b89425d7135 | |
| parent | b692ccb2414928913ebd713a094fc3150db07495 (diff) | |
| parent | adcb8fdc38078f1868f408de21d1a08b59a7781b (diff) | |
Merge pull request #1088 from IT-Can/word-mime-fix
mime types doc fixes
| -rw-r--r-- | application/config/mimes.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index 2a68ce9e1..d69497a30 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -120,7 +120,7 @@ $mimes = array('hqx' => array('application/mac-binhex40', 'application/mac-binhe 'mov' => 'video/quicktime', 'avi' => array('video/x-msvideo', 'video/msvideo', 'video/avi', 'application/x-troff-msvideo'), 'movie' => 'video/x-sgi-movie', - 'doc' => 'application/msword', + 'doc' => array('application/msword', 'application/vnd.ms-office'), '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'), diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 1297a166c..d6a9f0d2a 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -28,6 +28,7 @@ Release Date: Not Released - Added support for 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php. - Added support for m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php. - Added support for kmz and kml (Google Earth) files to mimes.php. + - Updated support for doc files in mimes.php. - Added application/xml for xml and application/xml, text/xsl for xsl in mimes.php. - Changed logger to only chmod when file is first created. - Removed previously deprecated SHA1 Library. |