From 92e048746c3849dd809e2c47f235b69e02af7e9b Mon Sep 17 00:00:00 2001
From: Derek Allard <derek.allard@ellislab.com>
Date: Mon, 25 Feb 2008 14:25:31 +0000
Subject: Added 'application/vnd.ms-powerpoint' to list of mime types.

---
 system/application/config/mimes.php | 2 +-
 user_guide/changelog.html           | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/system/application/config/mimes.php b/system/application/config/mimes.php
index 225b0a543..a8addb932 100644
--- a/system/application/config/mimes.php
+++ b/system/application/config/mimes.php
@@ -30,7 +30,7 @@ $mimes = array(	'hqx'	=>	'application/mac-binhex40',
 				'smil'	=>	'application/smil',
 				'mif'	=>	'application/vnd.mif',
 				'xls'	=>	array('application/excel', 'application/vnd.ms-excel'),
-				'ppt'	=>	'application/powerpoint',
+				'ppt'	=>	array('application/powerpoint', 'application/vnd.ms-powerpoint'),
 				'wbxml'	=>	'application/wbxml',
 				'wmlc'	=>	'application/wmlc',
 				'dcr'	=>	'application/x-director',
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index bb155ea8a..e93088cdf 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -62,7 +62,9 @@ Change Log
 <p>Release Date: not currently released</p>
 <ul>
     <li>No additions currently listed</li>
-    </ul>
+    <li>Added 'application/vnd.ms-powerpoint' to list of mime types.<br />
+    </li>
+</ul>
 <h3>Bugfixes for 1.6.2</h3>
 <ul>
     <li>Fixed assorted user guide typos (#3453)</li>
-- 
cgit v1.2.3-24-g4f1b