From be59efcfbf2203e340eda9fc672632801ce88195 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Sun, 4 Jan 2015 03:09:22 +0000 Subject: [PATCH] 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 --- wp-includes/functions.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 76013c934e..00480d6848 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -2174,7 +2174,7 @@ function wp_get_mime_types() { 'gif' => 'image/gif', 'png' => 'image/png', 'bmp' => 'image/bmp', - 'tif|tiff' => 'image/tiff', + 'tiff|tif' => 'image/tiff', 'ico' => 'image/x-icon', // Video formats. 'asf|asx' => 'video/x-ms-asf', diff --git a/wp-includes/version.php b/wp-includes/version.php index 6e4a5758e7..27c0896afc 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @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.