Ticket #20657: 20657.4.patch

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 ( 0 == $src_x && 0 == $src_y && $src_w == $dst_w && $src_h == $dst_h ) {
+                // No cropping, just copy the file
+                if ( is_numeric( $src ) ) {
+                        $src_file = get_attached_file( $src );
+                        if ( ! file_exists( $src_file ) )
+                                $src_file = _load_image_file( $src );
+                } else {
+                        $src_file = $src;
+                }
 
+                $dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file );
+                if ( $src_file && copy( $src_file, $dst_file ) )
+                        return $dst_file;
+                else
+                        return false;
+        }
+
         if ( is_numeric( $src ) ) { // Handle int as attachment ID
                 $src_file = get_attached_file( $src );
                 if ( ! file_exists( $src_file ) ) {
@@ -364 +378 @@
         return apply_filters('file_is_displayable_image', $result, $path);
 }
 
-function load_image_to_edit($post_id, $mime_type, $size = 'full') {
+/**
+ * Attempt to load an attachment from URL (for replication plugins).
+ *
+ * @since 3.4.0
+ * @access private
+ *
+ * @param string $post_id Attachment post ID.
+ * @param string $size Optional. Image size, defaults to 'full'.
+ * @return string|false Local file path on success, false on failure.
+ */
+function _load_image_file( $post_id, $size = 'full' ) {
         $filepath = get_attached_file($post_id);
 
         if ( $filepath && file_exists($filepath) ) {
@@ -376 +400 @@
         }
 
         $filepath = apply_filters('load_image_to_edit_path', $filepath, $post_id, $size);
-        if ( empty($filepath) )
+        if ( empty( $filepath ) )
                 return false;
+}
 
+/**
+ * Load an image resource for editing.
+ *
+ * @since 2.9.0
+ *
+ * @param string $post_id Attachment post ID.
+ * @param string $mime_type Image mime type.
+ * @param string $size Optional. Image size, defaults to 'full'.
+ * @return resource|false The resulting image resource on success, false on failure.
+ */
+function load_image_to_edit( $post_id, $mime_type, $size = 'full' ) {
+        $filepath = _load_image_file( $post_id, $size );
+        if ( empty( $filepath ) )
+                return false;
+
         switch ( $mime_type ) {
                 case 'image/jpeg':
                         $image = imagecreatefromjpeg($filepath);