Changeset 20769

Timestamp:

05/11/2012 04:15:15 PM (13 years ago)

Author:

ryan

Message:

Check wp_crop_image() for a false return value. Don't delete original image if crop not sucessful. Don't delete the original image when wp_crop_image() returns it untouched. Prevents deletion of header image when no cropping is done to the originally uploaded image. Props SergeyBiryukov, westi. fixes #20657

File:

• trunk/wp-admin/custom-header.php (modified) (4 diffs)

trunk/wp-admin/custom-header.php

@@ -753 +753 @@
             $oitar = $width / $max_width;
             $image = wp_crop_image($id, 0, 0, $width, $height, $max_width, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
-            if ( is_wp_error( $image ) )
+            if ( ! $image || is_wp_error( $image ) )
                 wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
 
@@ -869 +869 @@
 
         $cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $dst_width, $dst_height );
-        if ( is_wp_error( $cropped ) )
+        if ( ! $cropped || is_wp_error( $cropped ) )
             wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
 
         $cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication
+        $is_cropped = ( get_attached_file( $attachment_id ) != $cropped );
 
         $parent = get_post($attachment_id);
         $parent_url = $parent->guid;
-        $url = str_replace(basename($parent_url), basename($cropped), $parent_url);
+        $url = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
 
         $size = @getimagesize( $cropped );
@@ -890 +891 @@
             'context' => 'custom-header'
         );
-        if ( isset( $_POST['new-attachment'] ) && $_POST['new-attachment'] )
-            unset($object['ID']);
+        if ( ! empty( $_POST['new-attachment'] ) )
+            unset( $object['ID'] );
 
         // Update the attachment
         $attachment_id = wp_insert_attachment( $object, $cropped );
         wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $cropped ) );
-        update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', get_option('stylesheet' ) );
+        update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', get_option( 'stylesheet' ) );
 
         set_theme_mod('header_image', $url);
@@ -910 +911 @@
 
         // cleanup
-        $medium = str_replace(basename($original), 'midsize-'.basename($original), $original);
+        $medium = str_replace( basename( $original ), 'midsize-' . basename( $original ), $original );
         if ( file_exists( $medium ) )
             @unlink( apply_filters( 'wp_delete_file', $medium ) );
-        if ( empty ( $_POST['new-attachment'] ) )
+        if ( empty( $_POST['new-attachment'] ) && $is_cropped )
             @unlink( apply_filters( 'wp_delete_file', $original ) );