<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[31694] trunk: EXIF/IPTC captions should populate Caption (`post_excerpt`) on upload, not Description (`post_content`).</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31694">31694</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31694","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-03-10 05:06:39 +0000 (Tue, 10 Mar 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/22768">#22768</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesimagephp">trunk/src/wp-admin/includes/image.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image.php 2015-03-09 21:48:38 UTC (rev 31693)
+++ trunk/src/wp-admin/includes/image.php 2015-03-10 05:06:39 UTC (rev 31694)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,20 +299,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $iptc['2#120'][0] ) ) { // description / legacy caption
</span><span class="cx" style="display: block; padding: 0 10px"> $caption = trim( $iptc['2#120'][0] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $meta['title'] ) ) {
- mbstring_binary_safe_encoding();
- $caption_length = strlen( $caption );
- reset_mbstring_encoding();
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ mbstring_binary_safe_encoding();
+ $caption_length = strlen( $caption );
+ reset_mbstring_encoding();
+
+ if ( empty( $meta['title'] ) && $caption_length < 80 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Assume the title is stored in 2:120 if it's short.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $caption_length < 80 ) {
- $meta['title'] = $caption;
- } else {
- $meta['caption'] = $caption;
- }
- } elseif ( $caption != $meta['title'] ) {
- $meta['caption'] = $caption;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta['title'] = $caption;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $meta['caption'] = $caption;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $iptc['2#110'][0] ) ) // credit
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,13 +343,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $meta['title'] ) && $description_length < 80 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Assume the title is stored in ImageDescription
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['title'] = trim( $exif['ImageDescription'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
+ if ( empty( $meta['caption'] ) && ! empty( $exif['COMPUTED']['UserComment'] ) ) {
+ $meta['caption'] = trim( $exif['COMPUTED']['UserComment'] );
+ }
+
+ if ( empty( $meta['caption'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta['caption'] = trim( $exif['ImageDescription'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( empty( $meta['caption'] ) && ! empty( $exif['Comments'] ) && trim( $exif['Comments'] ) != $meta['title'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( empty( $meta['caption'] ) && ! empty( $exif['Comments'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta['caption'] = trim( $exif['Comments'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2015-03-09 21:48:38 UTC (rev 31693)
+++ trunk/src/wp-admin/includes/media.php 2015-03-10 05:06:39 UTC (rev 31694)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,15 +280,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $file = $file['file'];
</span><span class="cx" style="display: block; padding: 0 10px"> $title = $name;
</span><span class="cx" style="display: block; padding: 0 10px"> $content = '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $excerpt = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '#^audio#', $type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = wp_read_audio_metadata( $file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $meta['title'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $meta['title'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = $meta['title'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = '';
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $title ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $meta['album'] ) && ! empty( $meta['artist'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,10 +335,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Use image exif/iptc data for title and caption defaults if possible.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = @wp_read_image_metadata( $file ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = $image_meta['title'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( trim( $image_meta['caption'] ) )
- $content = $image_meta['caption'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
+ if ( trim( $image_meta['caption'] ) ) {
+ $excerpt = $image_meta['caption'];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Construct the attachment array
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,6 +351,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_parent' => $post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => $title,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => $content,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_excerpt' => $excerpt,
</ins><span class="cx" style="display: block; padding: 0 10px"> ), $post_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This should never be set as it would then overwrite an existing attachment.
</span></span></pre></div>
<a id="trunktestsphpunittestsmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media.php 2015-03-09 21:48:38 UTC (rev 31693)
+++ trunk/tests/phpunit/tests/media.php 2015-03-10 05:06:39 UTC (rev 31694)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -540,4 +540,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, $filetype );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @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 );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>