<!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>[20706] trunk/wp-admin: Don't convert png to jpg when cropping a header.</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/20706">20706</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-05-02 21:35:56 +0000 (Wed, 02 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't convert png to jpg when cropping a header. Prevents stomping transparency. Props SergeyBiryukov, kovshenin. fixes <a href="http://core.trac.wordpress.org/ticket/20555">#20555</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
<li><a href="#trunkwpadminincludesimagephp">trunk/wp-admin/includes/image.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (20705 => 20706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2012-05-02 21:33:43 UTC (rev 20705)
+++ trunk/wp-admin/custom-header.php 2012-05-02 21:35:56 UTC (rev 20706)
</span><span class="lines">@@ -858,12 +858,15 @@
</span><span class="cx"> $parent_url = $parent->guid;
</span><span class="cx"> $url = str_replace(basename($parent_url), basename($cropped), $parent_url);
</span><span class="cx">
</span><ins>+ $size = @getimagesize( $cropped );
+ $image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
+
</ins><span class="cx"> // Construct the object array
</span><span class="cx"> $object = array(
</span><span class="cx"> 'ID' => $attachment_id,
</span><span class="cx"> 'post_title' => basename($cropped),
</span><span class="cx"> 'post_content' => $url,
</span><del>- 'post_mime_type' => 'image/jpeg',
</del><ins>+ 'post_mime_type' => $image_type,
</ins><span class="cx"> 'guid' => $url,
</span><span class="cx"> 'context' => 'custom-header'
</span><span class="cx"> );
</span></span></pre></div>
<a id="trunkwpadminincludesimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image.php (20705 => 20706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image.php 2012-05-02 21:33:43 UTC (rev 20705)
+++ trunk/wp-admin/includes/image.php 2012-05-02 21:35:56 UTC (rev 20706)
</span><span class="lines">@@ -44,17 +44,25 @@
</span><span class="cx"> * @return string|WP_Error|false New filepath on success, WP_Error or false on failure.
</span><span class="cx"> */
</span><span class="cx"> function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
</span><ins>+ if ( 0 == $src_x && 0 == $src_y && $src_w == $dst_w && $src_h == $dst_h )
+ return ( is_numeric( $src ) ) ? get_attached_file( $src ) : $src;
+
</ins><span class="cx"> if ( is_numeric( $src ) ) { // Handle int as attachment ID
</span><span class="cx"> $src_file = get_attached_file( $src );
</span><span class="cx"> if ( ! file_exists( $src_file ) ) {
</span><span class="cx"> // If the file doesn't exist, attempt a url fopen on the src link.
</span><span class="cx"> // This can occur with certain file replication plugins.
</span><span class="cx"> $post = get_post( $src );
</span><ins>+ $image_type = $post->post_mime_type;
</ins><span class="cx"> $src = load_image_to_edit( $src, $post->post_mime_type, 'full' );
</span><span class="cx"> } else {
</span><ins>+ $size = @getimagesize( $src_file );
+ $image_type = ( $size ) ? $size['mime'] : '';
</ins><span class="cx"> $src = wp_load_image( $src_file );
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><ins>+ $size = @getimagesize( $src );
+ $image_type = ( $size ) ? $size['mime'] : '';
</ins><span class="cx"> $src = wp_load_image( $src );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -78,14 +86,17 @@
</span><span class="cx"> if ( ! $dst_file )
</span><span class="cx"> $dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file );
</span><span class="cx">
</span><del>- $dst_file = preg_replace( '/\\.[^\\.]+$/', '.jpg', $dst_file );
</del><ins>+ if ( 'image/png' != $image_type )
+ $dst_file = preg_replace( '/\\.[^\\.]+$/', '.jpg', $dst_file );
</ins><span class="cx">
</span><span class="cx"> // The directory containing the original file may no longer exist when
</span><span class="cx"> // using a replication plugin.
</span><span class="cx"> wp_mkdir_p( dirname( $dst_file ) );
</span><span class="cx">
</span><del>- if ( imagejpeg( $dst, $dst_file, apply_filters( 'jpeg_quality', 90, 'wp_crop_image' ) ) )
</del><ins>+ if ( 'image/png' == $image_type && imagepng( $dst, $dst_file ) )
</ins><span class="cx"> return $dst_file;
</span><ins>+ elseif ( imagejpeg( $dst, $dst_file, apply_filters( 'jpeg_quality', 90, 'wp_crop_image' ) ) )
+ return $dst_file;
</ins><span class="cx"> else
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>