Ticket #22768: 22768.4.diff

src/wp-admin/includes/image.php

@@ -299 +299 @@
 
                         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;
                         }
 
                         if ( ! empty( $iptc['2#110'][0] ) ) // credit
@@ -346 +343 @@
                         if ( empty( $meta['title'] ) && $description_length < 80 ) {
                                 // 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'] );
                 }
 

src/wp-admin/includes/media.php

@@ -280 +280 @@
         $file = $file['file'];
         $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 ) ) {
 
                         if ( ! empty( $meta['album'] ) && ! empty( $meta['artist'] ) ) {
@@ -335 +335 @@
 
         // 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'];
+                }
         }
 
         // Construct the attachment array
@@ -348 +351 @@
                 'post_parent' => $post_id,
                 'post_title' => $title,
                 'post_content' => $content,
+                'post_excerpt' => $excerpt,
         ), $post_data );
 
         // This should never be set as it would then overwrite an existing attachment.