<!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>[20384] trunk/wp-admin: Make choosing a header image from the media library play nicely with file replication plugins that do not guarantee images will be retained in the local filesystem.</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/20384">20384</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-04-06 20:47:24 +0000 (Fri, 06 Apr 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Make choosing a header image from the media library play nicely with file replication plugins that do not guarantee images will be retained in the local filesystem.

* When passing an attachment ID to wp_crop_image(), use load_image_to_edit() to fetch the image via a url fopen when the image does not exist in the filesystem.
* Move load_image_to_edit() to wp-admin/includes/image.php so that it is always available for admin pages loads.
* Fallback to the height and width stored in the attachment meta when the image no longer exists in the filesystem.

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
<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>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (20383 => 20384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php        2012-04-06 20:15:14 UTC (rev 20383)
+++ trunk/wp-admin/custom-header.php        2012-04-06 20:47:24 UTC (rev 20384)
</span><span class="lines">@@ -700,7 +700,14 @@
</span><span class="cx">                         extract($this-&gt;step_2_manage_upload());
</span><span class="cx">                 }
</span><span class="cx"> 
</span><del>-                list($width, $height, $type, $attr) = getimagesize( $file );
</del><ins>+                if ( file_exists( $file ) ) {
+                        list( $width, $height, $type, $attr ) = getimagesize( $file );
+                } else {
+                        $data = wp_get_attachment_metadata( $id );
+                        $height = $data[ 'height' ];
+                        $width = $data[ 'width' ];
+                        unset( $data );
+                }
</ins><span class="cx"> 
</span><span class="cx">                 $max_width = 0;
</span><span class="cx">                 // For flex, limit size of image displayed to 1500px unless theme says otherwise
</span><span class="lines">@@ -716,7 +723,8 @@
</span><span class="cx">                         &amp;&amp; $width == get_theme_support( 'custom-header', 'width' ) &amp;&amp; $height == get_theme_support( 'custom-header', 'height' ) )
</span><span class="cx">                 {
</span><span class="cx">                         // Add the meta-data
</span><del>-                        wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
</del><ins>+                        if ( file_exists( $file ) )
+                                wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
</ins><span class="cx">                         update_post_meta( $id, '_wp_attachment_is_custom_header', get_option('stylesheet' ) );
</span><span class="cx"> 
</span><span class="cx">                         set_theme_mod('header_image', esc_url($url));
</span><span class="lines">@@ -724,7 +732,7 @@
</span><span class="cx">                         return $this-&gt;finished();
</span><span class="cx">                 } elseif ( $width &gt; $max_width ) {
</span><span class="cx">                         $oitar = $width / $max_width;
</span><del>-                        $image = wp_crop_image($file, 0, 0, $width, $height, $max_width, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
</del><ins>+                        $image = wp_crop_image($id, 0, 0, $width, $height, $max_width, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
</ins><span class="cx">                         if ( is_wp_error( $image ) )
</span><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></pre></div>
<a id="trunkwpadminincludesimageeditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image-edit.php (20383 => 20384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image-edit.php        2012-04-06 20:15:14 UTC (rev 20383)
+++ trunk/wp-admin/includes/image-edit.php        2012-04-06 20:47:24 UTC (rev 20384)
</span><span class="lines">@@ -197,45 +197,6 @@
</span><span class="cx"> &lt;?php
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-function load_image_to_edit($post_id, $mime_type, $size = 'full') {
-        $filepath = get_attached_file($post_id);
-
-        if ( $filepath &amp;&amp; file_exists($filepath) ) {
-                if ( 'full' != $size &amp;&amp; ( $data = image_get_intermediate_size($post_id, $size) ) ) {
-                        $filepath = apply_filters('load_image_to_edit_filesystempath', path_join( dirname($filepath), $data['file'] ), $post_id, $size);
-                }
-        } elseif ( function_exists('fopen') &amp;&amp; function_exists('ini_get') &amp;&amp; true == ini_get('allow_url_fopen') ) {
-                $filepath = apply_filters('load_image_to_edit_attachmenturl', wp_get_attachment_url($post_id) , $post_id, $size);
-        }
-
-        $filepath = apply_filters('load_image_to_edit_path', $filepath, $post_id, $size);
-        if ( empty($filepath) )
-                return false;
-
-        switch ( $mime_type ) {
-                case 'image/jpeg':
-                        $image = imagecreatefromjpeg($filepath);
-                        break;
-                case 'image/png':
-                        $image = imagecreatefrompng($filepath);
-                        break;
-                case 'image/gif':
-                        $image = imagecreatefromgif($filepath);
-                        break;
-                default:
-                        $image = false;
-                        break;
-        }
-        if ( is_resource($image) ) {
-                $image = apply_filters('load_image_to_edit', $image, $post_id, $size);
-                if ( function_exists('imagealphablending') &amp;&amp; function_exists('imagesavealpha') ) {
-                        imagealphablending($image, false);
-                        imagesavealpha($image, true);
-                }
-        }
-        return $image;
-}
-
</del><span class="cx"> function wp_stream_image($image, $mime_type, $post_id) {
</span><span class="cx">         $image = apply_filters('image_save_pre', $image, $post_id);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminincludesimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image.php (20383 => 20384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image.php        2012-04-06 20:15:14 UTC (rev 20383)
+++ trunk/wp-admin/includes/image.php        2012-04-06 20:47:24 UTC (rev 20384)
</span><span class="lines">@@ -43,13 +43,22 @@
</span><span class="cx">  * @param string $dst_file Optional. The destination file to write to.
</span><span class="cx">  * @return string|WP_Error|false New filepath on success, WP_Error or false on failure.
</span><span class="cx">  */
</span><del>-function wp_crop_image( $src_file, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
-        if ( is_numeric( $src_file ) ) // Handle int as attachment ID
-                $src_file = get_attached_file( $src_file );
</del><ins>+function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
+        if ( is_numeric( $src ) ) { // Handle int as attachment ID
+                $src_file = get_attached_file( $src );
+                if ( ! file_exists( $src_file ) ) {
+                        // If the file doesn't exist, attempt a url fopen on the src link.
+                        // This can occur with certain file replication plugins.
+                        $post = get_post( $src );
+                        $src = load_image_to_edit( $src, $post-&gt;post_mime_type, 'full' );
+                } else {
+                        $src = wp_load_image( $src_file );
+                }
+        } else {
+                $src = wp_load_image( $src_file );
+        }
</ins><span class="cx"> 
</span><del>-        $src = wp_load_image( $src_file );
-
-        if ( !is_resource( $src ) )
</del><ins>+        if ( ! is_resource( $src ) )
</ins><span class="cx">                 return new WP_Error( 'error_loading_image', $src, $src_file );
</span><span class="cx"> 
</span><span class="cx">         $dst = wp_imagecreatetruecolor( $dst_w, $dst_h );
</span><span class="lines">@@ -59,7 +68,7 @@
</span><span class="cx">                 $src_h -= $src_y;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (function_exists('imageantialias'))
</del><ins>+        if ( function_exists( 'imageantialias' ) )
</ins><span class="cx">                 imageantialias( $dst, true );
</span><span class="cx"> 
</span><span class="cx">         imagecopyresampled( $dst, $src, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
</span><span class="lines">@@ -71,6 +80,10 @@
</span><span class="cx"> 
</span><span class="cx">         $dst_file = preg_replace( '/\\.[^\\.]+$/', '.jpg', $dst_file );
</span><span class="cx"> 
</span><ins>+        // The directory containing the original file may no longer exist when
+        // using a replication plugin.
+        wp_mkdir_p( dirname( $dst_file ) );
+
</ins><span class="cx">         if ( imagejpeg( $dst, $dst_file, apply_filters( 'jpeg_quality', 90, 'wp_crop_image' ) ) )
</span><span class="cx">                 return $dst_file;
</span><span class="cx">         else
</span><span class="lines">@@ -339,3 +352,42 @@
</span><span class="cx"> 
</span><span class="cx">         return apply_filters('file_is_displayable_image', $result, $path);
</span><span class="cx"> }
</span><ins>+
+function load_image_to_edit($post_id, $mime_type, $size = 'full') {
+        $filepath = get_attached_file($post_id);
+
+        if ( $filepath &amp;&amp; file_exists($filepath) ) {
+                if ( 'full' != $size &amp;&amp; ( $data = image_get_intermediate_size($post_id, $size) ) ) {
+                        $filepath = apply_filters('load_image_to_edit_filesystempath', path_join( dirname($filepath), $data['file'] ), $post_id, $size);
+                }
+        } elseif ( function_exists('fopen') &amp;&amp; function_exists('ini_get') &amp;&amp; true == ini_get('allow_url_fopen') ) {
+                $filepath = apply_filters('load_image_to_edit_attachmenturl', wp_get_attachment_url($post_id) , $post_id, $size);
+        }
+
+        $filepath = apply_filters('load_image_to_edit_path', $filepath, $post_id, $size);
+        if ( empty($filepath) )
+                return false;
+
+        switch ( $mime_type ) {
+                case 'image/jpeg':
+                        $image = imagecreatefromjpeg($filepath);
+                        break;
+                case 'image/png':
+                        $image = imagecreatefrompng($filepath);
+                        break;
+                case 'image/gif':
+                        $image = imagecreatefromgif($filepath);
+                        break;
+                default:
+                        $image = false;
+                        break;
+        }
+        if ( is_resource($image) ) {
+                $image = apply_filters('load_image_to_edit', $image, $post_id, $size);
+                if ( function_exists('imagealphablending') &amp;&amp; function_exists('imagesavealpha') ) {
+                        imagealphablending($image, false);
+                        imagesavealpha($image, true);
+                }
+        }
+        return $image;
+}
</ins></span></pre>
</div>
</div>

</body>
</html>