Changeset 22538

Timestamp:

11/10/2012 08:42:27 PM (12 years ago)

Author:

ryan

Message:

Pass an attachment ID, not a file path, to _load_image_to_edit_path() from wp_crop_image(). This fixes handling of attachments that require url fopen to access the image.

Allow passing urls instead of just file paths to WP_Image_Editor_Imagick::load() and WP_Image_Editor_GD::load() so that attachments requiring URL fopen can be handled.

see #6821

Location:

trunk

Files:

• wp-admin/includes/image.php (modified) (1 diff)
• wp-includes/class-wp-image-editor-gd.php (modified) (1 diff)
• wp-includes/class-wp-image-editor-imagick.php (modified) (1 diff)

trunk/wp-admin/includes/image.php

@@ -23 +23 @@
  * @return string|WP_Error|false New filepath on success, WP_Error or false on failure.
  */
-function wp_crop_image( $src_file, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
-    if ( is_numeric( $src_file ) ) { // Handle int as attachment ID
-        $src_file = get_attached_file( $src_file );
+function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
+    $src_file = $src;
+    if ( is_numeric( $src ) ) { // Handle int as attachment ID
+        $src_file = get_attached_file( $src );
+
         if ( ! file_exists( $src_file ) ) {
             // If the file doesn't exist, attempt a url fopen on the src link.
             // This can occur with certain file replication plugins.
-            $src_file = _load_image_to_edit_path( $src_file, 'full' );
+            $src_file = _load_image_to_edit_path( $src, 'full' );
         }
     }

trunk/wp-includes/class-wp-image-editor-gd.php

@@ -52 +52 @@
             return true;
 
-        if ( ! is_file( $this->file ) )
+        if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
             return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );
 

trunk/wp-includes/class-wp-image-editor-imagick.php

@@ -53 +53 @@
             return true;
 
-        if ( ! is_file( $this->file ) )
+        if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
             return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );