Changeset 53303

Timestamp:

04/28/2022 10:58:48 AM (3 years ago)

Author:

mikeschroder

Message:

Media: Ensure wp_read_image_metadata filter returns array for $iptc and $exif.

Makes the behavior of the filter lines up with its documentation.
Previously, both $iptc and $exif could return false when exif_read_data() or iptcparse() failed.

Now, if those functions do not return an array, the results are explicitly set to array().

Props volodymyrkolesnykov, SergeyBiryukov, sabernhardt, sumitsingh, mikeschroder.
Fixes #54637.

File:

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

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

@@ -777 +777 @@
             }
 
+            if ( ! is_array( $iptc ) ) {
+                $iptc = array();
+            }
+
             // Headline, "A brief synopsis of the caption".
             if ( ! empty( $iptc['2#105'][0] ) ) {
@@ -844 +848 @@
             // phpcs:ignore WordPress.PHP.NoSilencedErrors -- Silencing notice and warning is intentional. See https://core.trac.wordpress.org/ticket/42480
             $exif = @exif_read_data( $file );
+        }
+
+        if ( ! is_array( $exif ) ) {
+            $exif = array();
         }