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

ImageMagick expects TIFF files to have `.tiff` as an extension, so the key in `wp_get_mime_types()` should be `'tiff|tif'` not `'tif|tiff'` so the proper extension is returned in `WP_Image_Editor->get_extension()` subclass invocations. 

Fixes #30211.

Built from https://develop.svn.wordpress.org/trunk@31044


git-svn-id: http://core.svn.wordpress.org/trunk@31025 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-01-04 03:09:22 +00:00
parent a9302b2e36
commit be59efcfbf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/functions.php
View File

@ -2174,7 +2174,7 @@ function wp_get_mime_types() {
'gif' => 'image/gif', 'gif' => 'image/gif',
'png' => 'image/png', 'png' => 'image/png',
'bmp' => 'image/bmp', 'bmp' => 'image/bmp',
'tif|tiff' => 'image/tiff', 'tiff|tif' => 'image/tiff',
'ico' => 'image/x-icon', 'ico' => 'image/x-icon',
// Video formats. // Video formats.
'asf|asx' => 'video/x-ms-asf', 'asf|asx' => 'video/x-ms-asf',

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31043'; $wp_version = '4.2-alpha-31044';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.