Changeset 22571

Timestamp:

11/14/2012 02:26:52 PM (12 years ago)

Author:

nacin

Message:

wp_generate_attachment_metadata() should not call WP_Image_Editor if there's nothing to resize. props mdawaffe. fixes #22438.

File:

• trunk/wp-admin/includes/image.php (modified) (1 diff)

trunk/wp-admin/includes/image.php

@@ -100 +100 @@
         $sizes = apply_filters( 'intermediate_image_sizes_advanced', $sizes );
 
-        $editor = WP_Image_Editor::get_instance( $file );
-
-        if ( ! is_wp_error( $editor ) )
-            $metadata['sizes'] = $editor->multi_resize( $sizes );
+        if ( $sizes ) {
+            $editor = WP_Image_Editor::get_instance( $file );
+
+            if ( ! is_wp_error( $editor ) )
+                $metadata['sizes'] = $editor->multi_resize( $sizes );
+        } else {
+            $metadata['sizes'] = array();
+        }
 
         // fetch additional metadata from exif/iptc