Ticket #33772: 33772.diff

src/wp-admin/includes/image.php

@@ -277 +277 @@
                 'shutter_speed' => 0,
                 'title' => '',
                 'orientation' => 0,
+                'keywords' => array(),
         );
 
         /*
@@ -325 +326 @@
 
                         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'] );
+                        }
                  }
         }
 
@@ -414 +419 @@
          * @param array  $meta            Image meta data.
          * @param string $file            Path to image file.
          * @param int    $sourceImageType Type of image.
+         * @param array  $iptc            IPTC data.
          */
-        return apply_filters( 'wp_read_image_metadata', $meta, $file, $sourceImageType );
+        return apply_filters( 'wp_read_image_metadata', $meta, $file, $sourceImageType, $iptc );
 
 }
 

tests/phpunit/tests/image/meta.php

@@ -138 +138 @@
                 $out = wp_read_image_metadata(DIR_TESTDATA.'/images/404_image.png');
                 $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']);
+
+        }
+
 }