Changeset 34374

Timestamp:

09/22/2015 04:18:02 AM (11 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.

Location:

trunk

Files:

• src/wp-admin/includes/image.php (modified) (3 diffs)
• tests/phpunit/tests/image/meta.php (modified) (1 diff)

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 );
 
 }

trunk/tests/phpunit/tests/image/meta.php

@@ -139 +139 @@
                 $this->assertFalse($out);
         }
+
+
+        /**
+         * @ticket 33772
+         */
+        public function test_exif_keywords() {
+                $out = wp_read_image_metadata(DIR_TESTDATA.'/images/33772.jpg');
+
+                $this->assertEquals( '8', $out['aperture'] );
+                $this->assertEquals( 'Photoshop Author', $out['credit'] );
+                $this->assertEquals( 'DMC-LX2', $out['camera'] );
+                $this->assertEquals( 'Photoshop Description', $out['caption'] );
+                $this->assertEquals( 1306315327, $out['created_timestamp'] );
+                $this->assertEquals( 'Photoshop Copyrright Notice', $out['copyright'] );
+                $this->assertEquals( '6.3', $out['focal_length'] );
+                $this->assertEquals( '100', $out['iso'] );
+                $this->assertEquals( '0.0025', $out['shutter_speed'] );
+                $this->assertEquals( 'Photoshop Document Ttitle', $out['title'] );
+                $this->assertEquals( 1, $out['orientation']);
+                $this->assertEquals( array( 'beach', 'baywatch', 'LA', 'sunset' ), $out['keywords'] );
+        }
+
 }