WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix overuse of default mime icon and re-shuffle mp4/m4a file type matches. Props andy. see #5911 

git-svn-id: http://svn.automattic.com/wordpress/trunk@7045 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-02-26 19:57:00 +00:00
parent 8cd7ff8b76
commit 77f215393c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/functions.php
View File

@ -1188,12 +1188,12 @@ function wp_check_filetype( $filename, $mimes = null ) {
'asf|asx|wax|wmv|wmx' => 'video/asf', 'asf|asx|wax|wmv|wmx' => 'video/asf',
'avi' => 'video/avi', 'avi' => 'video/avi',
'mov|qt' => 'video/quicktime', 'mov|qt' => 'video/quicktime',
'mpeg|mpg|mpe' => 'video/mpeg', 'mpeg|mpg|mpe|mp4' => 'video/mpeg',
'txt|c|cc|h' => 'text/plain', 'txt|c|cc|h' => 'text/plain',
'rtx' => 'text/richtext', 'rtx' => 'text/richtext',
'css' => 'text/css', 'css' => 'text/css',
'htm|html' => 'text/html', 'htm|html' => 'text/html',
'mp3|mp4' => 'audio/mpeg', 'mp3|m4a' => 'audio/mpeg',
'ra|ram' => 'audio/x-realaudio', 'ra|ram' => 'audio/x-realaudio',
'wav' => 'audio/wav', 'wav' => 'audio/wav',
'ogg' => 'audio/ogg', 'ogg' => 'audio/ogg',

3
wp-includes/post.php
View File

@ -2390,9 +2390,8 @@ function wp_mime_type_icon( $mime = 0 ) {
$post_mimes[] = str_replace('/', '_', $mime); $post_mimes[] = str_replace('/', '_', $mime);
} }
$post_mimes[] = 'default';
$matches = wp_match_mime_types(array_keys($types), $post_mimes); $matches = wp_match_mime_types(array_keys($types), $post_mimes);
$matches['default'] = array('default');
foreach ( $matches as $match => $wilds ) { foreach ( $matches as $match => $wilds ) {
if ( isset($types[$wilds[0]])) { if ( isset($types[$wilds[0]])) {