Ticket #18947: 18947.patch

wp-admin/includes/image.php

@@ -103 +103 @@
                 // make thumbnails and other intermediate sizes
                 global $_wp_additional_image_sizes;
 
-                foreach ( get_intermediate_image_sizes() as $s ) {
+                foreach ( array_keys( get_intermediate_image_sizes() ) as $s ) {
                         $sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => FALSE );
                         if ( isset( $_wp_additional_image_sizes[$s]['width'] ) )
                                 $sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] ); // For theme-added sizes

wp-includes/media.php

@@ -583 +583 @@
  */
 function get_intermediate_image_sizes() {
         global $_wp_additional_image_sizes;
-        $image_sizes = array('thumbnail', 'medium', 'large'); // Standard sizes
+        $image_sizes = array('thumbnail', 'medium', 'large'); // Standard sizes 
+        foreach ( $image_sizes as $size ) {
+                $image_sizes[ $size ]['width']  = intval( get_option( "{$size}_size_w") );
+                $image_sizes[ $size ]['height'] = intval( get_option( "{$size}_size_h") );
+                // Crop false per default if not set
+                $image_sizes[ $size ]['crop']   = get_option( "{$size}_crop" ) ? get_option( "{$size}_crop" ) : false;
+        }
         if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
                 $image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
 

wp-includes/post.php

@@ -3817 +3817 @@
         }
 
         // remove intermediate and backup images if there are any
-        foreach ( get_intermediate_image_sizes() as $size ) {
+        foreach ( array_keys( get_intermediate_image_sizes() ) as $size ) {
                 if ( $intermediate = image_get_intermediate_size($post_id, $size) ) {
                         $intermediate_file = apply_filters('wp_delete_file', $intermediate['path']);
                         @ unlink( path_join($uploadpath['basedir'], $intermediate_file) );