Changeset 34374 for trunk/src/wp-admin/includes/image.php

Timestamp:

09/22/2015 04:18:02 AM (9 years ago)

Author:

wonderboymusic

Message:

Media: In wp_read_image_metadata(), include IPTC Keywords when available in $meta.

Adds unit test.

Props swissspidy, dbru, SteveHoneyNZ.
Fixes #33772.

File:

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

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

@@ -278 +278 @@
         'title' => '',
         'orientation' => 0,
+        'keywords' => array(),
     );
 
@@ -326 +327 @@
             if ( ! empty( $iptc['2#116'][0] ) ) // copyright
                 $meta['copyright'] = trim( $iptc['2#116'][0] );
+
+            if ( ! empty( $iptc['2#025'][0] ) ) { // keywords array
+                $meta['keywords'] = array_values( $iptc['2#025'] );
+            }
          }
     }
@@ -411 +416 @@
      *
      * @since 2.5.0
+     * @since 4.4.0 The `$iptc` parameter was added.
      *
      * @param array  $meta            Image meta data.
      * @param string $file            Path to image file.
      * @param int    $sourceImageType Type of image.
-     */
-    return apply_filters( 'wp_read_image_metadata', $meta, $file, $sourceImageType );
+     * @param array  $iptc            IPTC data.
+     */
+    return apply_filters( 'wp_read_image_metadata', $meta, $file, $sourceImageType, $iptc );
 
 }