Changeset 24727

Timestamp:

07/17/2013 09:16:44 PM (12 years ago)

Author:

ryan

Message:

Fix editing images with GD when using streams.

Props rmccue, markoheijnen, nacin
fixes #24459

Location:

trunk/wp-includes

Files:

• class-wp-image-editor-gd.php (modified) (1 diff)
• class-wp-image-editor.php (modified) (2 diffs)

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

@@ -402 +402 @@
         }
     }
+
+    /**
+     * Either calls editor's save function or handles file as a stream.
+     *
+     * @since 3.5.0
+     * @access protected
+     *
+     * @param string|stream $filename
+     * @param callable $function
+     * @param array $arguments
+     * @return boolean
+     */
+    protected function make_image( $filename, $function, $arguments ) {
+        if ( wp_is_stream( $filename ) )
+            $arguments[1] = null;
+
+        return parent::make_image( $filename, $function, $arguments );
+    }
 }

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

@@ -328 +328 @@
      */
     protected function make_image( $filename, $function, $arguments ) {
-        $dst_file = $filename;
-
-        // The directory containing the original file may no longer exist when using a replication plugin.
-        wp_mkdir_p( dirname( $dst_file ) );
-
         if ( $stream = wp_is_stream( $filename ) ) {
-            $filename = null;
             ob_start();
+        } else {
+            // The directory containing the original file may no longer exist when using a replication plugin. 
+            wp_mkdir_p( dirname( $filename ) ); 
         }
 
@@ -343 +340 @@
             $contents = ob_get_contents();
 
-            $fp = fopen( $dst_file, 'w' );
+            $fp = fopen( $filename, 'w' );
 
             if ( ! $fp )