Ticket #52603: 52603.2.diff

src/wp-admin/includes/image.php

@@ -470 +470 @@
  *
  * @param int    $attachment_id Attachment Id to process.
  * @param string $file          Filepath of the Attached image.
- * @return mixed Metadata for attachment.
+ * @return array Metadata for attachment.
  */
 function wp_generate_attachment_metadata( $attachment_id, $file ) {
         $attachment = get_post( $attachment_id );
@@ -490 +490 @@
                 $support  = current_theme_supports( 'post-thumbnails', 'attachment:audio' ) || post_type_supports( 'attachment:audio', 'thumbnail' );
         }
 
+        if ( ! is_array( $metadata ) ) {
+                $metadata = array();
+        }
+
         if ( $support && ! empty( $metadata['image']['data'] ) ) {
                 // Check for existing cover.
                 $hash   = md5( $metadata['image']['data'] );
@@ -613 +617 @@
         }
 
         // Remove the blob of binary data from the array.
-        if ( $metadata ) {
-                unset( $metadata['image']['data'] );
-        }
+        unset( $metadata['image']['data'] );
 
         /**
          * Filters the generated attachment meta data.