Ticket #28805: 28805.diff

src/wp-includes/functions.php

@@ -2013 +2013 @@
          *                        of file types.
          */
         $ext2type = apply_filters( 'ext2type', array(
-                'image'       => array( 'jpg', 'jpeg', 'jpe',  'gif',  'png',  'bmp',   'tif',  'tiff', 'ico' ),
-                'audio'       => array( 'aac', 'ac3',  'aif',  'aiff', 'm3a',  'm4a',   'm4b',  'mka',  'mp1',  'mp2',  'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma' ),
-                'video'       => array( '3g2',  '3gp', '3gpp', 'asf', 'avi',  'divx', 'dv',   'flv',  'm4v',   'mkv',  'mov',  'mp4',  'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt',  'rm', 'vob', 'wmv' ),
-                'document'    => array( 'doc', 'docx', 'docm', 'dotm', 'odt',  'pages', 'pdf',  'xps',  'oxps', 'rtf',  'wp',   'wpd' ),
-                'spreadsheet' => array( 'numbers',     'ods',  'xls',  'xlsx', 'xlsm',  'xlsb' ),
-                'interactive' => array( 'swf', 'key',  'ppt',  'pptx', 'pptm', 'pps',   'ppsx', 'ppsm', 'sldx', 'sldm', 'odp' ),
-                'text'        => array( 'asc', 'csv',  'tsv',  'txt' ),
-                'archive'     => array( 'bz2', 'cab',  'dmg',  'gz',   'rar',  'sea',   'sit',  'sqx',  'tar',  'tgz',  'zip', '7z' ),
-                'code'        => array( 'css', 'htm',  'html', 'php',  'js' ),
+                'image'       => array( 'jpg',     'jpeg', 'jpe',  'gif',  'png',  'bmp',   'tif',  'tiff', 'ico' ),
+                'audio'       => array( 'aac',     'ac3',  'aif',  'aiff', 'm3a',  'm4a',   'm4b',  'mka',  'mp1',  'mp2',  'mp3',  'ogg',  'oga',  'ram', 'wav', 'wma' ),
+                'video'       => array( '3g2',     '3gp',  '3gpp', 'asf',  'avi',  'divx',  'dv',   'flv',  'm4v',  'mkv',  'mov',  'mp4',  'mpeg', 'mpg', 'mpv', 'ogm',  'ogv', 'qt', 'rm', 'vob', 'wmv' ),
+                'document'    => array( 'doc',     'docx', 'docm', 'dotm', 'odt',  'pages', 'pdf',  'xps',  'oxps', 'rtf',  'wp',   'wpd',  'psd' ),
+                'spreadsheet' => array( 'numbers', 'ods',  'xls',  'xlsx', 'xlsm', 'xlsb' ),
+                'interactive' => array( 'swf',     'key',  'ppt',  'pptx', 'pptm', 'pps',   'ppsx', 'ppsm', 'sldx', 'sldm', 'odp' ),
+                'text'        => array( 'asc',     'csv',  'tsv',  'txt' ),
+                'archive'     => array( 'bz2',     'cab',  'dmg',  'gz',   'rar',  'sea',   'sit',  'sqx',  'tar',  'tgz',  'zip',  '7z' ),
+                'code'        => array( 'css',     'htm',  'html', 'php',  'js' ),
         ) );
 
         foreach ( $ext2type as $type => $exts )
@@ -2215 +2215 @@
         'rtf' => 'application/rtf',
         'js' => 'application/javascript',
         'pdf' => 'application/pdf',
+        'psd' => 'application/octet-stream',
         'swf' => 'application/x-shockwave-flash',
         'class' => 'application/java',
         'tar' => 'application/x-tar',