summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/application/config/mimes.php2
-rw-r--r--user_guide/changelog.html5
2 files changed, 6 insertions, 1 deletions
diff --git a/system/application/config/mimes.php b/system/application/config/mimes.php
index 10acfad9a..438f610ce 100644
--- a/system/application/config/mimes.php
+++ b/system/application/config/mimes.php
@@ -29,7 +29,7 @@ $mimes = array( 'hqx' => 'application/mac-binhex40',
'smi' => 'application/smil',
'smil' => 'application/smil',
'mif' => 'application/vnd.mif',
- 'xls' => array('application/excel', 'application/vnd.ms-excel'),
+ 'xls' => array('application/excel', 'application/vnd.ms-excel', 'application/msexcel'),
'ppt' => array('application/powerpoint', 'application/vnd.ms-powerpoint'),
'wbxml' => 'application/wbxml',
'wmlc' => 'application/wmlc',
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 245f218c5..dbe4c6653 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -82,6 +82,11 @@ SVN Revision: </p>
<li>Added ability to force lowercase for url_title() in the <a href="helpers/url_helper.html">URL helper</a>.</li>
</ul>
</li>
+ <li>Other Changes
+ <ul>
+ <li>Added 'application/msexcel' to config/mimes.php for .xls files.</li>
+ </ul>
+ </li>
</ul>
<h3>Bug fixes for 1.7.1</h3>