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

In `WP_Image_Editor::get_output_format()`, `$file_mime` and `$file_ext` are set twice before they are used. 

See #27882.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28148 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-05-06 18:37:29 +00:00
parent 73b102bd84
commit 013d4dc387
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/class-wp-image-editor.php
View File

@ -270,8 +270,7 @@ abstract class WP_Image_Editor {
* @return array { filename|null, extension, mime-type } * @return array { filename|null, extension, mime-type }
*/ */
protected function get_output_format( $filename = null, $mime_type = null ) { protected function get_output_format( $filename = null, $mime_type = null ) {
$new_ext = $file_ext = null; $new_ext = null;
$file_mime = null;
// By default, assume specified type takes priority // By default, assume specified type takes priority
if ( $mime_type ) { if ( $mime_type ) {