Changeset 51162

Timestamp:

06/15/2021 04:51:54 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Media: Make sure wp_generate_attachment_metadata() always returns an array.

This matches the documentation for the filter of the same name.

Previously, the function could return false for an audio or video attachment that does not exist in the local filesystem.

Props Chouby, SergeyBiryukov.
Fixes #52603.

File:

• trunk/src/wp-admin/includes/image.php (modified) (3 diffs)

trunk/src/wp-admin/includes/image.php

@@ -471 +471 @@
  * @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 ) {
@@ -489 +489 @@
         $metadata = wp_read_audio_metadata( $file );
         $support  = current_theme_supports( 'post-thumbnails', 'attachment:audio' ) || post_type_supports( 'attachment:audio', 'thumbnail' );
+    }
+
+    // wp_read_video_metadata() and wp_read_audio_metadata() return `false` if the attachment
+    // does not exist in the local filesystem, so make sure to convert the value to an array.
+    if ( ! is_array( $metadata ) ) {
+        $metadata = array();
     }
 
@@ -617 +623 @@
 
     // Remove the blob of binary data from the array.
-    if ( $metadata ) {
-        unset( $metadata['image']['data'] );
-    }
+    unset( $metadata['image']['data'] );
 
     /**