Ticket #20657: 20657.6.patch

wp-admin/custom-header.php

@@ -788 +788 @@
         <?php } ?>
         <?php wp_nonce_field( 'custom-header-crop-image' ) ?>
 
-        <?php submit_button( __( 'Crop and Publish' ) ); ?>
+        <p class="submit"><?php
+        submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false );
+        if ( isset( $oitar ) && 1 == $oitar )
+                submit_button( __( 'Skip Cropping, Use Image as Is' ), 'primary', 'skip-cropping', false );
+        ?>
         </p>
 </form>
 </div>
@@ -867 +871 @@
                 else
                         $dst_width = get_theme_support( 'custom-header', 'width' );
 
-                $cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $dst_width, $dst_height );
-                if ( ! $cropped || is_wp_error( $cropped ) )
-                        wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+                if ( !isset( $_POST['skip-cropping'] ) ) {
+                        $cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $dst_width, $dst_height );
+                        if ( ! $cropped || is_wp_error( $cropped ) )
+                                wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+                } else {
+                        $cropped = get_attached_file( $attachment_id );
+                }
 
                 $cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication
-                $is_cropped = ( get_attached_file( $attachment_id ) != $cropped );
+                $is_cropped = ( !isset( $_POST['skip-cropping'] ) && ( get_attached_file( $attachment_id ) != $cropped ) );
 
                 $parent = get_post($attachment_id);
                 $parent_url = $parent->guid;
@@ -890 +898 @@
                         'guid' => $url,
                         'context' => 'custom-header'
                 );
-                if ( ! empty( $_POST['new-attachment'] ) )
+                if ( ! empty( $_POST['new-attachment'] ) && $is_cropped )
                         unset( $object['ID'] );
 
                 // Update the attachment