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

Update our Windows media file MIME types to the official Microsoft-recommended ones. 

props niallkennedy, wonderboymusic. fixes #14253

git-svn-id: http://core.svn.wordpress.org/trunk@23422 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Mark Jaquith 2013-02-15 16:12:40 +00:00
parent 504e7b2fb7
commit 4ca36c6337
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/functions.php
View File

@ -1437,7 +1437,7 @@ function get_temp_dir() {
/** /**
* Determine if a directory is writable. * Determine if a directory is writable.
* *
* This function is used to work around certain ACL issues * This function is used to work around certain ACL issues
* in PHP primarily affecting Windows Servers. * in PHP primarily affecting Windows Servers.
* *
* @see win_is_writable() * @see win_is_writable()
@ -1457,7 +1457,7 @@ function wp_is_writable( $path ) {
/** /**
* Workaround for Windows bug in is_writable() function * Workaround for Windows bug in is_writable() function
* *
* PHP has issues with Windows ACL's for determine if a * PHP has issues with Windows ACL's for determine if a
* directory is writable or not, this works around them by * directory is writable or not, this works around them by
* checking the ability to open files rather than relying * checking the ability to open files rather than relying
* upon PHP to interprate the OS ACL. * upon PHP to interprate the OS ACL.
@ -1912,7 +1912,10 @@ function wp_get_mime_types() {
'tif|tiff' => 'image/tiff', 'tif|tiff' => 'image/tiff',
'ico' => 'image/x-icon', 'ico' => 'image/x-icon',
// Video formats // Video formats
'asf|asx|wax|wmv|wmx' => 'video/asf', 'asf|asx' => 'video/x-ms-asf',
'wmv' => 'video/x-ms-wmv',
'wmx' => 'video/x-ms-wmx',
'wm' => 'video/x-ms-wm',
'avi' => 'video/avi', 'avi' => 'video/avi',
'divx' => 'video/divx', 'divx' => 'video/divx',
'flv' => 'video/x-flv', 'flv' => 'video/x-flv',
@ -1936,7 +1939,8 @@ function wp_get_mime_types() {
'wav' => 'audio/wav', 'wav' => 'audio/wav',
'ogg|oga' => 'audio/ogg', 'ogg|oga' => 'audio/ogg',
'mid|midi' => 'audio/midi', 'mid|midi' => 'audio/midi',
'wma' => 'audio/wma', 'wma' => 'audio/x-ms-wma',
'wax' => 'audio/x-ms-wax',
'mka' => 'audio/x-matroska', 'mka' => 'audio/x-matroska',
// Misc application formats // Misc application formats
'rtf' => 'application/rtf', 'rtf' => 'application/rtf',