<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[12524] trunk: Retunr WP_Error from wp_crop_image() and image_resize().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12524">12524</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-12-23 18:39:31 +0000 (Wed, 23 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Retunr WP_Error from wp_crop_image() and image_resize(). Props mdwaffe. fixes <a href="http://trac.wordpress.org/ticket/9922">#9922</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>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.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 (12523 => 12524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2009-12-23 18:35:12 UTC (rev 12523)
+++ trunk/wp-admin/custom-header.php 2009-12-23 18:39:31 UTC (rev 12524)
</span><span class="lines">@@ -360,6 +360,9 @@
</span><span class="cx"> } elseif ( $width > HEADER_IMAGE_WIDTH ) {
</span><span class="cx"> $oitar = $width / HEADER_IMAGE_WIDTH;
</span><span class="cx"> $image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
</span><ins>+ if ( is_wp_error( $image ) )
+ wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+
</ins><span class="cx"> $image = apply_filters('wp_create_file_in_uploads', $image, $id); // For replication
</span><span class="cx">
</span><span class="cx"> $url = str_replace(basename($url), basename($image), $url);
</span><span class="lines">@@ -414,6 +417,9 @@
</span><span class="cx"> $original = get_attached_file( $_POST['attachment_id'] );
</span><span class="cx">
</span><span class="cx"> $cropped = wp_crop_image($_POST['attachment_id'], $_POST['x1'], $_POST['y1'], $_POST['width'], $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT);
</span><ins>+ if ( is_wp_error( $cropped ) )
+ wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+
</ins><span class="cx"> $cropped = apply_filters('wp_create_file_in_uploads', $cropped, $_POST['attachment_id']); // For replication
</span><span class="cx">
</span><span class="cx"> $parent = get_post($_POST['attachment_id']);
</span></span></pre></div>
<a id="trunkwpadminincludesimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image.php (12523 => 12524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image.php 2009-12-23 18:35:12 UTC (rev 12523)
+++ trunk/wp-admin/includes/image.php 2009-12-23 18:39:31 UTC (rev 12524)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> * @param int $dst_h The destination height.
</span><span class="cx"> * @param int $src_abs Optional. If the source crop points are absolute.
</span><span class="cx"> * @param string $dst_file Optional. The destination file to write to.
</span><del>- * @return string New filepath on success, String error message on failure.
</del><ins>+ * @return string|WP_Error|false New filepath on success, WP_Error or false on failure.
</ins><span class="cx"> */
</span><span class="cx"> function wp_crop_image( $src_file, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
</span><span class="cx"> if ( is_numeric( $src_file ) ) // Handle int as attachment ID
</span><span class="lines">@@ -46,8 +46,8 @@
</span><span class="cx">
</span><span class="cx"> $src = wp_load_image( $src_file );
</span><span class="cx">
</span><del>- if ( !is_resource( $src ))
- return $src;
</del><ins>+ if ( !is_resource( $src ) )
+ return new WP_Error( 'error_loading_image', $src, $src_file );
</ins><span class="cx">
</span><span class="cx"> $dst = wp_imagecreatetruecolor( $dst_w, $dst_h );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (12523 => 12524)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2009-12-23 18:35:12 UTC (rev 12523)
+++ trunk/wp-includes/media.php 2009-12-23 18:39:31 UTC (rev 12524)
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx">
</span><span class="cx"> $image = wp_load_image( $file );
</span><span class="cx"> if ( !is_resource( $image ) )
</span><del>- return new WP_Error('error_loading_image', $image);
</del><ins>+ return new WP_Error( 'error_loading_image', $image, $file );
</ins><span class="cx">
</span><span class="cx"> $size = @getimagesize( $file );
</span><span class="cx"> if ( !$size )
</span></span></pre>
</div>
</div>
</body>
</html>