Ticket #10531: naming-10531.patch

wp-admin/includes/image.php

@@ -109 +109 @@
                 $sizes = apply_filters('intermediate_image_sizes', $sizes);
 
                 foreach ($sizes as $size) {
-                        $resized = image_make_intermediate_size( $full_path_file, get_option("{$size}_size_w"), get_option("{$size}_size_h"), get_option("{$size}_crop") );
+                        $resized = image_make_intermediate_size( $full_path_file, get_option("{$size}_size_w"), get_option("{$size}_size_h"), get_option("{$size}_crop"), $size );
                         if ( $resized )
                                 $metadata['sizes'][$size] = $resized;
                 }

wp-includes/media.php

@@ -385 +385 @@
                 $rotated = false;
                 if ( IMAGETYPE_JPEG == $orig_type ) {
                         // rotate if EXIF 'Orientation' is set
-                        $exif = exif_read_data($file, null, true);
+                        $exif = is_callable('exif_read_data') ? @exif_read_data($file, null, true) : null;
                         if ( $exif && isset($exif['IFD0']) && is_array($exif['IFD0']) && isset($exif['IFD0']['Orientation']) ) {
                                 if ( 6 == $exif['IFD0']['Orientation'] )
                                         $rotated = rotate_image($newimage, 90);
@@ -432 +432 @@
  * @param bool $crop Optional, default is false. Whether to crop image to specified height and width or resize.
  * @return bool|array False, if no image was created. Metadata array on success.
  */
-function image_make_intermediate_size($file, $width, $height, $crop=false) {
+function image_make_intermediate_size($file, $width, $height, $crop=false, $suffix = null) {
         if ( $width || $height ) {
-                $resized_file = image_resize($file, $width, $height, $crop);
+                $resized_file = image_resize($file, $width, $height, $crop, $suffix);
                 if ( !is_wp_error($resized_file) && $resized_file && $info = getimagesize($resized_file) ) {
                         $resized_file = apply_filters('image_make_intermediate_size', $resized_file);
                         return array(