<!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>[20769] trunk/wp-admin/custom-header.php: Check wp_crop_image() for a false return value.</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/20769">20769</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-05-11 16:15:15 +0000 (Fri, 11 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Check wp_crop_image() for a false return value. Don't delete original image if crop not sucessful. Don't delete the original image when wp_crop_image() returns it untouched. Prevents deletion of header image when no cropping is done to the originally uploaded image. Props SergeyBiryukov, westi. fixes <a href="http://core.trac.wordpress.org/ticket/20657">#20657</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.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 (20768 => 20769)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2012-05-11 07:12:20 UTC (rev 20768)
+++ trunk/wp-admin/custom-header.php 2012-05-11 16:15:15 UTC (rev 20769)
</span><span class="lines">@@ -752,7 +752,7 @@
</span><span class="cx"> } elseif ( $width > $max_width ) {
</span><span class="cx"> $oitar = $width / $max_width;
</span><span class="cx"> $image = wp_crop_image($id, 0, 0, $width, $height, $max_width, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
</span><del>- if ( is_wp_error( $image ) )
</del><ins>+ if ( ! $image || is_wp_error( $image ) )
</ins><span class="cx"> wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
</span><span class="cx">
</span><span class="cx"> $image = apply_filters('wp_create_file_in_uploads', $image, $id); // For replication
</span><span class="lines">@@ -868,14 +868,15 @@
</span><span class="cx"> $dst_width = get_theme_support( 'custom-header', 'width' );
</span><span class="cx">
</span><span class="cx"> $cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $dst_width, $dst_height );
</span><del>- if ( is_wp_error( $cropped ) )
</del><ins>+ if ( ! $cropped || is_wp_error( $cropped ) )
</ins><span class="cx"> wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
</span><span class="cx">
</span><span class="cx"> $cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication
</span><ins>+ $is_cropped = ( get_attached_file( $attachment_id ) != $cropped );
</ins><span class="cx">
</span><span class="cx"> $parent = get_post($attachment_id);
</span><span class="cx"> $parent_url = $parent->guid;
</span><del>- $url = str_replace(basename($parent_url), basename($cropped), $parent_url);
</del><ins>+ $url = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
</ins><span class="cx">
</span><span class="cx"> $size = @getimagesize( $cropped );
</span><span class="cx"> $image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
</span><span class="lines">@@ -889,13 +890,13 @@
</span><span class="cx"> 'guid' => $url,
</span><span class="cx"> 'context' => 'custom-header'
</span><span class="cx"> );
</span><del>- if ( isset( $_POST['new-attachment'] ) && $_POST['new-attachment'] )
- unset($object['ID']);
</del><ins>+ if ( ! empty( $_POST['new-attachment'] ) )
+ unset( $object['ID'] );
</ins><span class="cx">
</span><span class="cx"> // Update the attachment
</span><span class="cx"> $attachment_id = wp_insert_attachment( $object, $cropped );
</span><span class="cx"> wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $cropped ) );
</span><del>- update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', get_option('stylesheet' ) );
</del><ins>+ update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', get_option( 'stylesheet' ) );
</ins><span class="cx">
</span><span class="cx"> set_theme_mod('header_image', $url);
</span><span class="cx">
</span><span class="lines">@@ -909,10 +910,10 @@
</span><span class="cx"> set_theme_mod( 'header_image_data', $header_data );
</span><span class="cx">
</span><span class="cx"> // cleanup
</span><del>- $medium = str_replace(basename($original), 'midsize-'.basename($original), $original);
</del><ins>+ $medium = str_replace( basename( $original ), 'midsize-' . basename( $original ), $original );
</ins><span class="cx"> if ( file_exists( $medium ) )
</span><span class="cx"> @unlink( apply_filters( 'wp_delete_file', $medium ) );
</span><del>- if ( empty ( $_POST['new-attachment'] ) )
</del><ins>+ if ( empty( $_POST['new-attachment'] ) && $is_cropped )
</ins><span class="cx"> @unlink( apply_filters( 'wp_delete_file', $original ) );
</span><span class="cx">
</span><span class="cx"> return $this->finished();
</span></span></pre>
</div>
</div>
</body>
</html>