<!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>[22192] trunk: Check for WP_Error return from WP_Image_Editor::get_instance().</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/22192">22192</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-10-11 18:59:41 +0000 (Thu, 11 Oct 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Check for WP_Error return from WP_Image_Editor::get_instance().

Props markoheijnen
see <a href="http://core.trac.wordpress.org/ticket/6821">#6821</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesimageeditphp">trunk/wp-admin/includes/image-edit.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="trunkwpadminincludesimageeditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image-edit.php (22191 => 22192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image-edit.php        2012-10-11 18:20:53 UTC (rev 22191)
+++ trunk/wp-admin/includes/image-edit.php        2012-10-11 18:59:41 UTC (rev 22192)
</span><span class="lines">@@ -568,7 +568,7 @@
</span><span class="cx">         $post = get_post( $post_id );
</span><span class="cx"> 
</span><span class="cx">         $img = WP_Image_Editor::get_instance( _load_image_to_edit_path( $post_id, 'full' ) );
</span><del>-        if ( !$img ) {
</del><ins>+        if ( is_wp_error( $img ) ) {
</ins><span class="cx">                 $return-&gt;error = esc_js( __('Unable to create new image.') );
</span><span class="cx">                 return $return;
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkwpadminincludesimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image.php (22191 => 22192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image.php        2012-10-11 18:20:53 UTC (rev 22191)
+++ trunk/wp-admin/includes/image.php        2012-10-11 18:59:41 UTC (rev 22192)
</span><span class="lines">@@ -33,8 +33,10 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         $editor = WP_Image_Editor::get_instance( $src_file );
</span><ins>+        if ( is_wp_error( $editor ) )
+                return $editor;
+
</ins><span class="cx">         $src = $editor-&gt;crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs );
</span><del>-
</del><span class="cx">         if ( is_wp_error( $src ) )
</span><span class="cx">                 return $src;
</span><span class="cx"> 
</span><span class="lines">@@ -94,8 +96,10 @@
</span><span class="cx">                 $sizes = apply_filters( 'intermediate_image_sizes_advanced', $sizes );
</span><span class="cx"> 
</span><span class="cx">                 $editor = WP_Image_Editor::get_instance( $file );
</span><del>-                $metadata['sizes'] = $editor-&gt;multi_resize( $sizes );
</del><span class="cx"> 
</span><ins>+                if ( ! is_wp_error( $editor ) )
+                        $metadata['sizes'] = $editor-&gt;multi_resize( $sizes );
+
</ins><span class="cx">                 // fetch additional metadata from exif/iptc
</span><span class="cx">                 $image_meta = wp_read_image_metadata( $file );
</span><span class="cx">                 if ( $image_meta )
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (22191 => 22192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php        2012-10-11 18:20:53 UTC (rev 22191)
+++ trunk/wp-includes/media.php        2012-10-11 18:59:41 UTC (rev 22192)
</span><span class="lines">@@ -383,7 +383,7 @@
</span><span class="cx">         if ( $width || $height ) {
</span><span class="cx">                 $editor = WP_Image_Editor::get_instance( $file );
</span><span class="cx"> 
</span><del>-                if ( is_wp_error( $editor-&gt;resize( $width, $height, $crop ) ) );
</del><ins>+                if ( is_wp_error( $editor ) || is_wp_error( $editor-&gt;resize( $width, $height, $crop ) ) );
</ins><span class="cx">                         return false;
</span><span class="cx"> 
</span><span class="cx">                 $resized_file = $editor-&gt;save();
</span></span></pre>
</div>
</div>

</body>
</html>