Changeset 27522

Timestamp:

03/13/2014 04:17:36 AM (11 years ago)

Author:

wonderboymusic

Message:

The Image Editor should apply changes to custom image sizes by checking $_wp_additional_image_sizes for $size in wp_save_image() before arbitrarily going to the options table.

Props Otto42, SergeyBiryukov.
Fixes #19889.

File:

• trunk/src/wp-admin/includes/image-edit.php (modified) (2 diffs)

trunk/src/wp-admin/includes/image-edit.php

@@ -637 +637 @@
  */
 function wp_save_image( $post_id ) {
+    global $_wp_additional_image_sizes;
+
     $return = new stdClass;
     $success = $delete = $scaled = $nocrop = false;
@@ -771 +773 @@
             }
 
-            $crop = $nocrop ? false : get_option("{$size}_crop");
-            $_sizes[ $size ] = array( 'width' => get_option("{$size}_size_w"), 'height' => get_option("{$size}_size_h"), 'crop' => $crop );
+            if ( isset( $_wp_additional_image_sizes[ $size ] ) ) {
+                $width  = intval( $_wp_additional_image_sizes[ $size ]['width'] );
+                $height = intval( $_wp_additional_image_sizes[ $size ]['height'] );
+                $crop   = ( $nocrop ) ? false : intval( $_wp_additional_image_sizes[ $size ]['crop'] );
+            } else {
+                $height = get_option( "{$size}_size_h" );
+                $width  = get_option( "{$size}_size_w" );
+                $crop   = ( $nocrop ) ? false : get_option( "{$size}_crop" );
+            }
+
+            $_sizes[ $size ] = array( 'width' => $width, 'height' => $height, 'crop' => $crop );
         }