<!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>[23873] trunk: Sanity checks on image metadata to avoid warnings, etc.</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/23873">23873</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2013-03-29 20:51:35 +0000 (Fri, 29 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Sanity checks on image metadata to avoid warnings, etc.
fixes <a href="http://core.trac.wordpress.org/ticket/23733">#23733</a>. props wonderboymusic.</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="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.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 (23872 => 23873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2013-03-29 20:50:09 UTC (rev 23872)
+++ trunk/wp-admin/custom-header.php 2013-03-29 20:51:35 UTC (rev 23873)
</span><span class="lines">@@ -663,8 +663,8 @@
</span><span class="cx"> list( $width, $height, $type, $attr ) = getimagesize( $file );
</span><span class="cx"> } else {
</span><span class="cx"> $data = wp_get_attachment_metadata( $attachment_id );
</span><del>- $height = $data[ 'height' ];
- $width = $data[ 'width' ];
</del><ins>+ $height = isset( $data[ 'height' ] ) ? $data[ 'height' ] : 0;
+ $width = isset( $data[ 'width' ] ) ? $data[ 'width' ] : 0;
</ins><span class="cx"> unset( $data );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesimageeditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image-edit.php (23872 => 23873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image-edit.php 2013-03-29 20:50:09 UTC (rev 23872)
+++ trunk/wp-admin/includes/image-edit.php 2013-03-29 20:51:35 UTC (rev 23873)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> $sub_sizes = isset($meta['sizes']) && is_array($meta['sizes']);
</span><span class="cx"> $note = '';
</span><span class="cx">
</span><del>- if ( is_array($meta) && isset($meta['width']) )
</del><ins>+ if ( isset( $meta['width'], $meta['height'] ) )
</ins><span class="cx"> $big = max( $meta['width'], $meta['height'] );
</span><span class="cx"> else
</span><span class="cx"> die( __('Image data does not exist. Please re-upload the image.') );
</span><span class="lines">@@ -21,8 +21,9 @@
</span><span class="cx"> $sizer = $big > 400 ? 400 / $big : 1;
</span><span class="cx">
</span><span class="cx"> $backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
</span><del>- $can_restore = !empty($backup_sizes) && isset($backup_sizes['full-orig'])
- && $backup_sizes['full-orig']['file'] != basename($meta['file']);
</del><ins>+ $can_restore = false;
+ if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) )
+ $can_restore = $backup_sizes['full-orig']['file'] != basename( $meta['file'] );
</ins><span class="cx">
</span><span class="cx"> if ( $msg ) {
</span><span class="cx"> if ( isset($msg->error) )
</span><span class="lines">@@ -63,8 +64,8 @@
</span><span class="cx"> <input type="hidden" id="imgedit-history-<?php echo $post_id; ?>" value="" />
</span><span class="cx"> <input type="hidden" id="imgedit-undone-<?php echo $post_id; ?>" value="0" />
</span><span class="cx"> <input type="hidden" id="imgedit-selection-<?php echo $post_id; ?>" value="" />
</span><del>- <input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo $meta['width']; ?>" />
- <input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo $meta['height']; ?>" />
</del><ins>+ <input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
+ <input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
</ins><span class="cx">
</span><span class="cx"> <div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
</span><span class="cx"> <img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand(1, 99999); ?>" />
</span><span class="lines">@@ -82,9 +83,11 @@
</span><span class="cx"> <a class="imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" href="#"><strong><?php _e('Scale Image'); ?></strong></a>
</span><span class="cx"> <div class="imgedit-help">
</span><span class="cx"> <p><?php _e('You can proportionally scale the original image. For best results the scaling should be done before performing any other operations on it like crop, rotate, etc. Note that if you make the image larger it may become fuzzy.'); ?></p>
</span><ins>+ <?php if ( isset( $meta['width'], $meta['height'] ) ): ?>
</ins><span class="cx"> <p><?php printf( __('Original dimensions %s'), $meta['width'] . '&times;' . $meta['height'] ); ?></p>
</span><ins>+ <?php endif ?>
</ins><span class="cx"> <div class="imgedit-submit">
</span><del>- <span class="nowrap"><input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" style="width:4em;" value="<?php echo $meta['width']; ?>" />&times;<input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" style="width:4em;" value="<?php echo $meta['height']; ?>" />
</del><ins>+ <span class="nowrap"><input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" style="width:4em;" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />&times;<input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" style="width:4em;" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
</ins><span class="cx"> <span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>">!</span></span>
</span><span class="cx"> <input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" />
</span><span class="cx"> </div>
</span><span class="lines">@@ -499,7 +502,7 @@
</span><span class="cx"> $delpath = apply_filters('wp_delete_file', $file);
</span><span class="cx"> @unlink($delpath);
</span><span class="cx"> }
</span><del>- } else {
</del><ins>+ } elseif ( isset( $meta['width'], $meta['height'] ) ) {
</ins><span class="cx"> $backup_sizes["full-$suffix"] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $parts['basename']);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (23872 => 23873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2013-03-29 20:50:09 UTC (rev 23872)
+++ trunk/wp-admin/includes/media.php 2013-03-29 20:51:35 UTC (rev 23873)
</span><span class="lines">@@ -1127,7 +1127,7 @@
</span><span class="cx">
</span><span class="cx"> $media_dims = '';
</span><span class="cx"> $meta = wp_get_attachment_metadata( $post->ID );
</span><del>- if ( is_array( $meta ) && array_key_exists( 'width', $meta ) && array_key_exists( 'height', $meta ) )
</del><ins>+ if ( isset( $meta['width'], $meta['height'] ) )
</ins><span class="cx"> $media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
</span><span class="cx"> $media_dims = apply_filters( 'media_meta', $media_dims, $post );
</span><span class="cx">
</span><span class="lines">@@ -2368,7 +2368,7 @@
</span><span class="cx">
</span><span class="cx"> $media_dims = '';
</span><span class="cx"> $meta = wp_get_attachment_metadata( $post->ID );
</span><del>- if ( is_array( $meta ) && array_key_exists( 'width', $meta ) && array_key_exists( 'height', $meta ) )
</del><ins>+ if ( isset( $meta['width'], $meta['height'] ) )
</ins><span class="cx"> $media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
</span><span class="cx"> $media_dims = apply_filters( 'media_meta', $media_dims, $post );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (23872 => 23873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2013-03-29 20:50:09 UTC (rev 23872)
+++ trunk/wp-includes/media.php 2013-03-29 20:51:35 UTC (rev 23873)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> $is_intermediate = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if ( !$width && !$height && isset($meta['width'], $meta['height']) ) {
</del><ins>+ if ( !$width && !$height && isset( $meta['width'], $meta['height'] ) ) {
</ins><span class="cx"> // any other type: use the real image
</span><span class="cx"> $width = $meta['width'];
</span><span class="cx"> $height = $meta['height'];
</span><span class="lines">@@ -780,8 +780,11 @@
</span><span class="cx"> foreach ( $attachments as $id => $attachment ) {
</span><span class="cx"> $link = isset($attr['link']) && 'file' == $attr['link'] ? wp_get_attachment_link($id, $size, false, false) : wp_get_attachment_link($id, $size, true, false);
</span><span class="cx"> $image_meta = wp_get_attachment_metadata( $id );
</span><del>- $orientation = ( $image_meta['height'] > $image_meta['width'] ) ? 'portrait' : 'landscape';
</del><span class="cx">
</span><ins>+ $orientation = '';
+ if ( isset( $image_meta['height'], $image_meta['width'] ) )
+ $orientation = ( $image_meta['height'] > $image_meta['width'] ) ? 'portrait' : 'landscape';
+
</ins><span class="cx"> $output .= "<{$itemtag} class='gallery-item'>";
</span><span class="cx"> $output .= "
</span><span class="cx"> <{$icontag} class='gallery-icon {$orientation}'>
</span><span class="lines">@@ -1626,13 +1629,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $sizes['full'] = array(
- 'height' => $meta['height'],
- 'width' => $meta['width'],
- 'url' => $attachment_url,
- 'orientation' => $meta['height'] > $meta['width'] ? 'portrait' : 'landscape',
- );
</del><ins>+ $sizes['full'] = array( 'url' => $attachment_url );
</ins><span class="cx">
</span><ins>+ if ( isset( $meta['height'], $meta['width'] ) ) {
+ $sizes['full']['height'] = $meta['height'];
+ $sizes['full']['width'] = $meta['width'];
+ $sizes['full']['orientation'] = $meta['height'] > $meta['width'] ? 'portrait' : 'landscape';
+ }
+
</ins><span class="cx"> $response = array_merge( $response, array( 'sizes' => $sizes ), $sizes['full'] );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (23872 => 23873)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2013-03-29 20:50:09 UTC (rev 23872)
+++ trunk/wp-includes/theme.php 2013-03-29 20:51:35 UTC (rev 23873)
</span><span class="lines">@@ -1013,8 +1013,10 @@
</span><span class="cx"> $header_images[$header_index]['attachment_id'] = $header->ID;
</span><span class="cx"> $header_images[$header_index]['url'] = $url;
</span><span class="cx"> $header_images[$header_index]['thumbnail_url'] = $url;
</span><del>- $header_images[$header_index]['width'] = $header_data['width'];
- $header_images[$header_index]['height'] = $header_data['height'];
</del><ins>+ if ( isset( $header_data['width'] ) )
+ $header_images[$header_index]['width'] = $header_data['width'];
+ if ( isset( $header_data['height'] ) )
+ $header_images[$header_index]['height'] = $header_data['height'];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $header_images;
</span></span></pre>
</div>
</div>
</body>
</html>