Changeset 28366 for trunk/src/wp-admin/includes/image-edit.php

Timestamp:

05/11/2014 03:41:31 AM (12 years ago)

Author:

wonderboymusic

Message:

Avoid a notice in wp_save_image() by checking $meta['sizes']['thumbnail'] for ! empty() before setting a variable to it.

Props MikeHansenMe.
Fixes #17736.

File:

• trunk/src/wp-admin/includes/image-edit.php (modified) (5 diffs)

trunk/src/wp-admin/includes/image-edit.php

@@ -145 +145 @@
 
         </div>
-        
+
         <div class="imgedit-panel-content">
                 <?php echo $note; ?>
                 <div class="imgedit-menu">
                         <div onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop disabled" title="<?php esc_attr_e( 'Crop' ); ?>"></div><?php
-        
+
                 // On some setups GD library does not provide imagerotate() - Ticket #11536
                 if ( wp_image_editor_supports( array( 'mime_type' => get_post_mime_type( $post_id ), 'methods' => array( 'rotate' ) ) ) ) { ?>
@@ -161 +161 @@
                     <div class="imgedit-rright disabled" title="<?php echo $note_no_rotate; ?>"></div>
         <?php } ?>
-        
+
                         <div onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv" title="<?php esc_attr_e( 'Flip vertically' ); ?>"></div>
                         <div onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph" title="<?php esc_attr_e( 'Flip horizontally' ); ?>"></div>
-        
+
                         <div id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-undo disabled" title="<?php esc_attr_e( 'Undo' ); ?>"></div>
                         <div id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-redo disabled" title="<?php esc_attr_e( 'Redo' ); ?>"></div>
                         <br class="clear" />
                 </div>
-        
+
                 <input type="hidden" id="imgedit-sizer-<?php echo $post_id; ?>" value="<?php echo $sizer; ?>" />
                 <input type="hidden" id="imgedit-minthumb-<?php echo $post_id; ?>" value="<?php echo ( get_option('thumbnail_size_w') . ':' . get_option('thumbnail_size_h') ); ?>" />
@@ -177 +177 @@
                 <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; ?>" />
-        
+
                 <div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
                 <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); ?>" />
                 </div>
-        
+
                 <div class="imgedit-submit">
                         <input type="button" onclick="imageEdit.close(<?php echo $post_id; ?>, 1)" class="button" value="<?php esc_attr_e( 'Cancel' ); ?>" />
@@ -187 +187 @@
                 </div>
         </div>
-        
+
         </div>
         <div class="imgedit-wait" id="imgedit-wait-<?php echo $post_id; ?>"></div>
@@ -805 +805 @@
                         } else {
                                 $file_url = wp_get_attachment_url($post_id);
-                                if ( $thumb = $meta['sizes']['thumbnail'] )
+                                if ( ! empty( $meta['sizes']['thumbnail'] ) && $thumb = $meta['sizes']['thumbnail'] ) {
                                         $return->thumbnail = path_join( dirname($file_url), $thumb['file'] );
-                                else
+                                } else {
                                         $return->thumbnail = "$file_url?w=128&h=128";
+                                }
                         }
                 }