Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-29 15:47:38 +02:00
Code Issues Projects Releases Wiki Activity

Avoid a notice in wp_save_image() by checking $meta['sizes']['thumbnail'] for ! empty() before setting a variable to it.

Browse Source 
Props MikeHansenMe.
Fixes #17736.


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


git-svn-id: http://core.svn.wordpress.org/trunk@28194 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-05-11 03:42:14 +00:00
parent 60f395e4c2
commit e9f87b2688
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/includes/image-edit.php
View File

@ -804,12 +804,13 @@ function wp_save_image( $post_id ) {
$return->thumbnail = $thumb_url[0]; $return->thumbnail = $thumb_url[0];
} else { } else {
$file_url = wp_get_attachment_url($post_id); $file_url = wp_get_attachment_url($post_id);
if ( $thumb = $meta['sizes']['thumbnail'] ) if ( ! empty( $meta['sizes']['thumbnail'] ) && $thumb = $meta['sizes']['thumbnail'] ) {
$return->thumbnail = path_join( dirname($file_url), $thumb['file'] ); $return->thumbnail = path_join( dirname($file_url), $thumb['file'] );
else } else {
$return->thumbnail = "$file_url?w=128&h=128"; $return->thumbnail = "$file_url?w=128&h=128";
} }
} }
}
} else { } else {
$delete = true; $delete = true;
} }