summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/application/config/mimes.php4
-rw-r--r--user_guide/changelog.html1
2 files changed, 3 insertions, 2 deletions
diff --git a/system/application/config/mimes.php b/system/application/config/mimes.php
index a8addb932..7f5f20803 100644
--- a/system/application/config/mimes.php
+++ b/system/application/config/mimes.php
@@ -51,12 +51,12 @@ $mimes = array( 'hqx' => 'application/mac-binhex40',
'tgz' => 'application/x-tar',
'xhtml' => 'application/xhtml+xml',
'xht' => 'application/xhtml+xml',
- 'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
+ 'zip' => array('application/x-zip', 'application/zip', 'application/x-zip-compressed'),
'mid' => 'audio/midi',
'midi' => 'audio/midi',
'mpga' => 'audio/mpeg',
'mp2' => 'audio/mpeg',
- 'mp3' => 'audio/mpeg',
+ 'mp3' => array('audio/mpeg', 'audio/mpg'),
'aif' => 'audio/x-aiff',
'aiff' => 'audio/x-aiff',
'aifc' => 'audio/x-aiff',
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index d17ae9ca7..e48db0e24 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -63,6 +63,7 @@ Change Log
<li>Config
<ul>
<li>Added 'application/vnd.ms-powerpoint' to list of mime types.</li>
+ <li>Added 'audio/mpg' to list of mime types.</li>
</ul>
</li>
<li>Libraries