<!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>[21905] trunk/wp-admin/includes/image.php: Avoid mangling UTF-8 strings that may be present in image metadata.</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, #logmsg > ol { margin-left: 0; 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/21905">21905</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-09-18 23:38:25 +0000 (Tue, 18 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid mangling UTF-8 strings that may be present in image metadata. props SergeyBiryukov for the unit tests [UT665]. fixes <a href="http://core.trac.wordpress.org/ticket/9417">#9417</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesimagephp">trunk/wp-admin/includes/image.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image.php (21904 => 21905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image.php 2012-09-18 23:08:46 UTC (rev 21904)
+++ trunk/wp-admin/includes/image.php 2012-09-18 23:38:25 UTC (rev 21905)
</span><span class="lines">@@ -237,13 +237,13 @@
</span><span class="cx">
</span><span class="cx"> // headline, "A brief synopsis of the caption."
</span><span class="cx"> if ( ! empty( $iptc['2#105'][0] ) )
</span><del>- $meta['title'] = utf8_encode( trim( $iptc['2#105'][0] ) );
</del><ins>+ $meta['title'] = trim( $iptc['2#105'][0] );
</ins><span class="cx"> // title, "Many use the Title field to store the filename of the image, though the field may be used in many ways."
</span><span class="cx"> elseif ( ! empty( $iptc['2#005'][0] ) )
</span><del>- $meta['title'] = utf8_encode( trim( $iptc['2#005'][0] ) );
</del><ins>+ $meta['title'] = trim( $iptc['2#005'][0] );
</ins><span class="cx">
</span><span class="cx"> if ( ! empty( $iptc['2#120'][0] ) ) { // description / legacy caption
</span><del>- $caption = utf8_encode( trim( $iptc['2#120'][0] ) );
</del><ins>+ $caption = trim( $iptc['2#120'][0] );
</ins><span class="cx"> if ( empty( $meta['title'] ) ) {
</span><span class="cx"> // Assume the title is stored in 2:120 if it's short.
</span><span class="cx"> if ( strlen( $caption ) < 80 )
</span><span class="lines">@@ -256,15 +256,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $iptc['2#110'][0] ) ) // credit
</span><del>- $meta['credit'] = utf8_encode(trim($iptc['2#110'][0]));
</del><ins>+ $meta['credit'] = trim( $iptc['2#110'][0] );
</ins><span class="cx"> elseif ( ! empty( $iptc['2#080'][0] ) ) // creator / legacy byline
</span><del>- $meta['credit'] = utf8_encode(trim($iptc['2#080'][0]));
</del><ins>+ $meta['credit'] = trim( $iptc['2#080'][0] );
</ins><span class="cx">
</span><span class="cx"> if ( ! empty( $iptc['2#055'][0] ) and ! empty( $iptc['2#060'][0] ) ) // created date and time
</span><span class="cx"> $meta['created_timestamp'] = strtotime( $iptc['2#055'][0] . ' ' . $iptc['2#060'][0] );
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $iptc['2#116'][0] ) ) // copyright
</span><del>- $meta['copyright'] = utf8_encode( trim( $iptc['2#116'][0] ) );
</del><ins>+ $meta['copyright'] = trim( $iptc['2#116'][0] );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -273,44 +273,49 @@
</span><span class="cx"> $exif = @exif_read_data( $file );
</span><span class="cx">
</span><span class="cx"> if ( !empty( $exif['Title'] ) )
</span><del>- $meta['title'] = utf8_encode( trim( $exif['Title'] ) );
</del><ins>+ $meta['title'] = trim( $exif['Title'] );
</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><del>- $meta['title'] = utf8_encode( trim( $exif['ImageDescription'] ) );
</del><ins>+ $meta['title'] = trim( $exif['ImageDescription'] );
</ins><span class="cx"> if ( ! empty( $exif['COMPUTED']['UserComment'] ) && trim( $exif['COMPUTED']['UserComment'] ) != $meta['title'] )
</span><del>- $meta['caption'] = utf8_encode( trim( $exif['COMPUTED']['UserComment'] ) );
</del><ins>+ $meta['caption'] = trim( $exif['COMPUTED']['UserComment'] );
</ins><span class="cx"> } elseif ( trim( $exif['ImageDescription'] ) != $meta['title'] ) {
</span><del>- $meta['caption'] = utf8_encode( trim( $exif['ImageDescription'] ) );
</del><ins>+ $meta['caption'] = trim( $exif['ImageDescription'] );
</ins><span class="cx"> }
</span><span class="cx"> } elseif ( ! empty( $exif['Comments'] ) && trim( $exif['Comments'] ) != $meta['title'] ) {
</span><del>- $meta['caption'] = utf8_encode( trim( $exif['Comments'] ) );
</del><ins>+ $meta['caption'] = trim( $exif['Comments'] );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $exif['Artist'] ) )
</span><del>- $meta['credit'] = utf8_encode( trim( $exif['Artist'] ) );
</del><ins>+ $meta['credit'] = trim( $exif['Artist'] );
</ins><span class="cx"> elseif ( ! empty($exif['Author'] ) )
</span><del>- $meta['credit'] = utf8_encode( trim( $exif['Author'] ) );
</del><ins>+ $meta['credit'] = trim( $exif['Author'] );
</ins><span class="cx">
</span><span class="cx"> if ( ! empty( $exif['Copyright'] ) )
</span><del>- $meta['copyright'] = utf8_encode( trim( $exif['Copyright'] ) );
</del><ins>+ $meta['copyright'] = trim( $exif['Copyright'] );
</ins><span class="cx"> if ( ! empty($exif['FNumber'] ) )
</span><span class="cx"> $meta['aperture'] = round( wp_exif_frac2dec( $exif['FNumber'] ), 2 );
</span><span class="cx"> if ( ! empty($exif['Model'] ) )
</span><del>- $meta['camera'] = utf8_encode( trim( $exif['Model'] ) );
</del><ins>+ $meta['camera'] = trim( $exif['Model'] );
</ins><span class="cx"> if ( ! empty($exif['DateTimeDigitized'] ) )
</span><span class="cx"> $meta['created_timestamp'] = wp_exif_date2ts($exif['DateTimeDigitized'] );
</span><span class="cx"> if ( ! empty($exif['FocalLength'] ) )
</span><span class="cx"> $meta['focal_length'] = wp_exif_frac2dec( $exif['FocalLength'] );
</span><span class="cx"> if ( ! empty($exif['ISOSpeedRatings'] ) ) {
</span><span class="cx"> $meta['iso'] = is_array( $exif['ISOSpeedRatings'] ) ? reset( $exif['ISOSpeedRatings'] ) : $exif['ISOSpeedRatings'];
</span><del>- $meta['iso'] = utf8_encode( trim( $meta['iso'] ) );
</del><ins>+ $meta['iso'] = trim( $meta['iso'] );
</ins><span class="cx"> }
</span><span class="cx"> if ( ! empty($exif['ExposureTime'] ) )
</span><span class="cx"> $meta['shutter_speed'] = wp_exif_frac2dec( $exif['ExposureTime'] );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ foreach ( array( 'title', 'caption', 'credit', 'copyright', 'camera', 'iso' ) as $key ) {
+ if ( $meta[ $key ] && ! seems_utf8( $meta[ $key ] ) )
+ $meta[ $key ] = utf8_encode( $meta[ $key ] );
+ }
+
</ins><span class="cx"> return apply_filters( 'wp_read_image_metadata', $meta, $file, $sourceImageType );
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>