<!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>[28367] trunk/src/wp-admin/includes/image.php: In `wp_read_image_metadata()`, the values from `exif_read_data()` should only override values from `iptcparse()` that are empty.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28367">28367</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-11 05:53:27 +0000 (Sun, 11 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>In `wp_read_image_metadata()`, the values from `exif_read_data()` should only override values from `iptcparse()` that are empty.
Props SergeyBiryukov.
Fixes <a href="http://core.trac.wordpress.org/ticket/23706">#23706</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesimagephp">trunk/src/wp-admin/includes/image.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesimagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/image.php (28366 => 28367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/image.php 2014-05-11 03:41:31 UTC (rev 28366)
+++ trunk/src/wp-admin/includes/image.php 2014-05-11 05:53:27 UTC (rev 28367)
</span><span class="lines">@@ -322,48 +322,60 @@
</span><span class="cx"> if ( is_callable( 'exif_read_data' ) && in_array( $sourceImageType, apply_filters( 'wp_read_image_metadata_types', array( IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM ) ) ) ) {
</span><span class="cx"> $exif = @exif_read_data( $file );
</span><span class="cx">
</span><del>- if ( !empty( $exif['Title'] ) )
</del><ins>+ if ( empty( $meta['title'] ) && ! empty( $exif['Title'] ) ) {
</ins><span class="cx"> $meta['title'] = trim( $exif['Title'] );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if ( ! empty( $exif['ImageDescription'] ) ) {
</span><span class="cx"> if ( empty( $meta['title'] ) && strlen( $exif['ImageDescription'] ) < 80 ) {
</span><span class="cx"> // Assume the title is stored in ImageDescription
</span><span class="cx"> $meta['title'] = trim( $exif['ImageDescription'] );
</span><del>- if ( ! empty( $exif['COMPUTED']['UserComment'] ) && trim( $exif['COMPUTED']['UserComment'] ) != $meta['title'] )
</del><ins>+ if ( empty( $meta['caption'] ) && ! empty( $exif['COMPUTED']['UserComment'] ) && trim( $exif['COMPUTED']['UserComment'] ) != $meta['title'] ) {
</ins><span class="cx"> $meta['caption'] = trim( $exif['COMPUTED']['UserComment'] );
</span><del>- } elseif ( trim( $exif['ImageDescription'] ) != $meta['title'] ) {
</del><ins>+ }
+ } elseif ( empty( $meta['caption'] ) && trim( $exif['ImageDescription'] ) != $meta['title'] ) {
</ins><span class="cx"> $meta['caption'] = trim( $exif['ImageDescription'] );
</span><span class="cx"> }
</span><del>- } elseif ( ! empty( $exif['Comments'] ) && trim( $exif['Comments'] ) != $meta['title'] ) {
</del><ins>+ } elseif ( empty( $meta['caption'] ) && ! empty( $exif['Comments'] ) && trim( $exif['Comments'] ) != $meta['title'] ) {
</ins><span class="cx"> $meta['caption'] = trim( $exif['Comments'] );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! empty( $exif['Artist'] ) )
- $meta['credit'] = trim( $exif['Artist'] );
- elseif ( ! empty($exif['Author'] ) )
- $meta['credit'] = trim( $exif['Author'] );
</del><ins>+ if ( empty( $meta['credit'] ) ) {
+ if ( ! empty( $exif['Artist'] ) ) {
+ $meta['credit'] = trim( $exif['Artist'] );
+ } elseif ( ! empty($exif['Author'] ) ) {
+ $meta['credit'] = trim( $exif['Author'] );
+ }
+ }
</ins><span class="cx">
</span><del>- if ( ! empty( $exif['Copyright'] ) )
</del><ins>+ if ( empty( $meta['copyright'] ) && ! empty( $exif['Copyright'] ) ) {
</ins><span class="cx"> $meta['copyright'] = trim( $exif['Copyright'] );
</span><del>- if ( ! empty($exif['FNumber'] ) )
</del><ins>+ }
+ if ( ! empty( $exif['FNumber'] ) ) {
</ins><span class="cx"> $meta['aperture'] = round( wp_exif_frac2dec( $exif['FNumber'] ), 2 );
</span><del>- if ( ! empty($exif['Model'] ) )
</del><ins>+ }
+ if ( ! empty( $exif['Model'] ) ) {
</ins><span class="cx"> $meta['camera'] = trim( $exif['Model'] );
</span><del>- if ( ! empty($exif['DateTimeDigitized'] ) )
- $meta['created_timestamp'] = wp_exif_date2ts($exif['DateTimeDigitized'] );
- if ( ! empty($exif['FocalLength'] ) )
</del><ins>+ }
+ if ( empty( $meta['created_timestamp'] ) && ! empty( $exif['DateTimeDigitized'] ) ) {
+ $meta['created_timestamp'] = wp_exif_date2ts( $exif['DateTimeDigitized'] );
+ }
+ if ( ! empty( $exif['FocalLength'] ) ) {
</ins><span class="cx"> $meta['focal_length'] = (string) wp_exif_frac2dec( $exif['FocalLength'] );
</span><del>- if ( ! empty($exif['ISOSpeedRatings'] ) ) {
</del><ins>+ }
+ if ( ! empty( $exif['ISOSpeedRatings'] ) ) {
</ins><span class="cx"> $meta['iso'] = is_array( $exif['ISOSpeedRatings'] ) ? reset( $exif['ISOSpeedRatings'] ) : $exif['ISOSpeedRatings'];
</span><span class="cx"> $meta['iso'] = trim( $meta['iso'] );
</span><span class="cx"> }
</span><del>- if ( ! empty($exif['ExposureTime'] ) )
</del><ins>+ if ( ! empty( $exif['ExposureTime'] ) ) {
</ins><span class="cx"> $meta['shutter_speed'] = (string) wp_exif_frac2dec( $exif['ExposureTime'] );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> foreach ( array( 'title', 'caption', 'credit', 'copyright', 'camera', 'iso' ) as $key ) {
</span><del>- if ( $meta[ $key ] && ! seems_utf8( $meta[ $key ] ) )
</del><ins>+ if ( $meta[ $key ] && ! seems_utf8( $meta[ $key ] ) ) {
</ins><span class="cx"> $meta[ $key ] = utf8_encode( $meta[ $key ] );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>