WordPress 3.5.1

[autoinstalls/wordpress.git] / wp-admin / includes / image-edit.php

diff --git a/wp-admin/includes/image-edit.php b/wp-admin/includes/image-edit.php
index 3e3b180267c32f08ca85bf1c32af53687fc6ae35..01bce7bd97208134a9b0ad121d3d362f24f054e6 100644 (file)
--- a/wp-admin/includes/image-edit.php
+++ b/wp-admin/includes/image-edit.php
@@ -692,7 +692,7 @@ function wp_save_image( $post_id ) {
                        $_sizes[ $size ] = array( 'width' => get_option("{$size}_size_w"), 'height' => get_option("{$size}_size_h"), 'crop' => $crop );
                }
 
                        $_sizes[ $size ] = array( 'width' => get_option("{$size}_size_w"), 'height' => get_option("{$size}_size_h"), 'crop' => $crop );
                }
 

-               $meta['sizes'] = $img->multi_resize( $_sizes );
+               $meta['sizes'] = array_merge( $meta['sizes'], $img->multi_resize( $_sizes ) );

        }
 
        unset( $img );
        }
 
        unset( $img );