Ticket #14253: 14253.diff

wp-includes/functions.php

@@ -1437 +1437 @@
 /**
  * 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.
  *
  * @see win_is_writable()
@@ -1457 +1457 @@
 /**
  * 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
  * checking the ability to open files rather than relying
  * upon PHP to interprate the OS ACL.
@@ -1912 +1912 @@
         'tif|tiff' => 'image/tiff',
         'ico' => 'image/x-icon',
         // 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',
         'divx' => 'video/divx',
         'flv' => 'video/x-flv',
@@ -1936 +1939 @@
         'wav' => 'audio/wav',
         'ogg|oga' => 'audio/ogg',
         'mid|midi' => 'audio/midi',
-        'wma' => 'audio/wma',
+        'wma' => 'audio/x-ms-wma',
+        'wax' => 'audio/x-ms-wax',
         'mka' => 'audio/x-matroska',
         // Misc application formats
         'rtf' => 'application/rtf',