Ticket #7252: imagedata-is_array.diff

wp-includes/post.php

@@ -2424 +2424 @@
         $post_id = (int) $post_id;
         if ( !$post =& get_post( $post_id ) )
                 return false;
-        if ( !$imagedata = wp_get_attachment_metadata( $post->ID ) )
+        if ( !is_array( $imagedata = wp_get_attachment_metadata( $post->ID ) ) )
                 return false;
 
         $file = get_attached_file( $post->ID );

wp-includes/media.php

@@ -274 +274 @@
 }
 
 function image_get_intermediate_size($post_id, $size='thumbnail') {
-        if ( !$imagedata = wp_get_attachment_metadata( $post_id ) )
+        if ( !is_array( $imagedata = wp_get_attachment_metadata( $post_id ) ) )
                 return false;
 
         // get the best one for a specified set of dimensions