Ticket #20657: 20657.8.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 );
 
                 $parent = get_post($attachment_id);
                 $parent_url = $parent->guid;
@@ -890 +897 @@
                         'guid' => $url,
                         'context' => 'custom-header'
                 );
-                if ( ! empty( $_POST['new-attachment'] ) )
+                if ( ! empty( $_POST['new-attachment'] ) && ! isset( $_POST['skip-cropping'] ) )
                         unset( $object['ID'] );
 
                 // Update the attachment
@@ -913 +920 @@
                 $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'] ) && $is_cropped )
+                if ( empty( $_POST['new-attachment'] ) && ! isset( $_POST['skip-cropping'] ) )
                         @unlink( apply_filters( 'wp_delete_file', $original ) );
 
                 return $this->finished();

wp-admin/includes/image.php

@@ -44 +44 @@
  * @return string|WP_Error|false New filepath on success, WP_Error or false on failure.
  */
 function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
-        if ( 0 == $src_x && 0 == $src_y && $src_w == $dst_w && $src_h == $dst_h )
-                return ( is_numeric( $src ) ) ? get_attached_file( $src ) : $src;
-
         if ( is_numeric( $src ) ) { // Handle int as attachment ID
                 $src_file = get_attached_file( $src );
                 if ( ! file_exists( $src_file ) ) {