Permalink
Browse files

Merge pull request #1204 from huglester/develop

Added .pptx support
  • Loading branch information...
2 parents f467044 + f497bf3 commit a650cd2bb753cbd0b57eecd62fe02adc7b4ef68a Phil Sturgeon committed Mar 16, 2012
Showing with 2 additions and 1 deletion.
  1. +1 −0 system/cms/config/mimes.php
  2. +1 −1 system/cms/modules/files/config/files.php
@@ -31,6 +31,7 @@
'mif' => 'application/vnd.mif',
'xls' => array('application/excel', 'application/vnd.ms-excel', 'application/msexcel'),
'ppt' => array('application/powerpoint', 'application/vnd.ms-powerpoint'),
+ 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
'wbxml' => 'application/wbxml',
'wmlc' => 'application/wmlc',
'dcr' => 'application/x-director',
@@ -5,7 +5,7 @@
$config['files_allowed_file_ext'] = array(
'a' => array('mpga', 'mp2', 'mp3', 'ra', 'rv', 'wav'),
'v' => array('mpeg', 'mpg', 'mpe', 'qt', 'mov', 'avi', 'movie'),
- 'd' => array('pdf', 'xls', 'ppt', 'txt', 'text', 'log', 'rtx', 'rtf', 'xml', 'xsl', 'doc', 'docx', 'xlsx', 'word', 'xl'),
+ 'd' => array('pdf', 'xls', 'ppt', 'pptx', 'txt', 'text', 'log', 'rtx', 'rtf', 'xml', 'xsl', 'doc', 'docx', 'xlsx', 'word', 'xl'),
'i' => array('bmp', 'gif', 'jpeg', 'jpg', 'jpe', 'png', 'tiff', 'tif'),
'o' => array('psd', 'gtar', 'swf', 'tar', 'tgz', 'xhtml', 'zip', 'css', 'html', 'htm', 'shtml')
);

0 comments on commit a650cd2

Please sign in to comment.