Changeset 31694 for trunk/src/wp-admin/includes/media.php

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.

File:

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

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