Changeset 31694

Timestamp:

03/10/2015 05:06:39 AM (12 years ago)

Author:

SergeyBiryukov

Message:

EXIF/IPTC captions should populate Caption (post_excerpt) on upload, not Description (post_content).

Make sure the caption is always set if found. Previously, if the caption was less than 80 characters, only the Title field would be set.

props beaulebens, ericlewis, bendoh, SergeyBiryukov.
fixes #22768.

Location:

trunk

Files:

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

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

@@ -300 +300 @@
                         if ( ! empty( $iptc['2#120'][0] ) ) { // description / legacy caption
                                 $caption = trim( $iptc['2#120'][0] );
-                                if ( empty( $meta['title'] ) ) {
-                                        mbstring_binary_safe_encoding();
-                                        $caption_length = strlen( $caption );
-                                        reset_mbstring_encoding();
-
+
+                                mbstring_binary_safe_encoding();
+                                $caption_length = strlen( $caption );
+                                reset_mbstring_encoding();
+
+                                if ( empty( $meta['title'] ) && $caption_length < 80 ) {
                                         // Assume the title is stored in 2:120 if it's short.
-                                        if ( $caption_length < 80 ) {
-                                                $meta['title'] = $caption;
-                                        } else {
-                                                $meta['caption'] = $caption;
-                                        }
-                                } elseif ( $caption != $meta['title'] ) {
-                                        $meta['caption'] = $caption;
+                                        $meta['title'] = $caption;
                                 }
+
+                                $meta['caption'] = $caption;
                         }
 
@@ -347 +344 @@
                                 // Assume the title is stored in ImageDescription
                                 $meta['title'] = trim( $exif['ImageDescription'] );
-                                if ( empty( $meta['caption'] ) && ! empty( $exif['COMPUTED']['UserComment'] ) && trim( $exif['COMPUTED']['UserComment'] ) != $meta['title'] ) {
-                                        $meta['caption'] = trim( $exif['COMPUTED']['UserComment'] );
-                                }
-                        } elseif ( empty( $meta['caption'] ) && trim( $exif['ImageDescription'] ) != $meta['title'] ) {
+                        }
+
+                        if ( empty( $meta['caption'] ) && ! empty( $exif['COMPUTED']['UserComment'] ) ) {
+                                $meta['caption'] = trim( $exif['COMPUTED']['UserComment'] );
+                        }
+
+                        if ( empty( $meta['caption'] ) ) {
                                 $meta['caption'] = trim( $exif['ImageDescription'] );
                         }
-                } elseif ( empty( $meta['caption'] ) && ! empty( $exif['Comments'] ) && trim( $exif['Comments'] ) != $meta['title'] ) {
+                } elseif ( empty( $meta['caption'] ) && ! empty( $exif['Comments'] ) ) {
                         $meta['caption'] = trim( $exif['Comments'] );
                 }

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

@@ -281 +281 @@
         $title = $name;
         $content = '';
+        $excerpt = '';
 
         if ( preg_match( '#^audio#', $type ) ) {
                 $meta = wp_read_audio_metadata( $file );
 
-                if ( ! empty( $meta['title'] ) )
+                if ( ! empty( $meta['title'] ) ) {
                         $title = $meta['title'];
-
-                $content = '';
+                }
 
                 if ( ! empty( $title ) ) {
@@ -336 +336 @@
         // Use image exif/iptc data for title and caption defaults if possible.
         } elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = @wp_read_image_metadata( $file ) ) {
-                if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
+                if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
                         $title = $image_meta['title'];
-                if ( trim( $image_meta['caption'] ) )
-                        $content = $image_meta['caption'];
+                }
+
+                if ( trim( $image_meta['caption'] ) ) {
+                        $excerpt = $image_meta['caption'];
+                }
         }
 
@@ -349 +352 @@
                 'post_title' => $title,
                 'post_content' => $content,
+                'post_excerpt' => $excerpt,
         ), $post_data );
 

trunk/tests/phpunit/tests/media.php

@@ -541 +541 @@
                 $this->assertEquals( $expected, $filetype );
         }
+
+        /**
+         * @ticket 22768
+         */
+        public function test_media_handle_upload_sets_post_excerpt() {
+                $iptc_file = DIR_TESTDATA . '/images/test-image-iptc.jpg';
+
+                // Make a copy of this file as it gets moved during the file upload
+                $tmp_name = wp_tempnam( $iptc_file );
+
+                copy( $iptc_file, $tmp_name );
+
+                $_FILES['upload'] = array(
+                        'tmp_name' => $tmp_name,
+                        'name'     => 'test-image-iptc.jpg',
+                        'type'     => 'image/jpeg',
+                        'error'    => 0,
+                        'size'     => filesize( $iptc_file )
+                );
+
+                $post_id = media_handle_upload( 'upload', 0, array(), array( 'action' => 'test_iptc_upload', 'test_form' => false ) );
+
+                unset( $_FILES['upload'] );
+
+                $post = get_post( $post_id );
+
+                $this->assertEquals( 'This is a comment. / Это комментарий. / Βλέπετε ένα σχόλιο.', $post->post_excerpt );
+        }
+
 }