Ticket #23019: wrong-type-image-options.diff

trunk/wp-admin/includes/image.php

@@ -82 +82 @@
                 global $_wp_additional_image_sizes;
 
                 foreach ( 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
-                        else
-                                $sizes[$s]['width'] = get_option( "{$s}_size_w" ); // For default sizes set in options
-                        if ( isset( $_wp_additional_image_sizes[$s]['height'] ) )
-                                $sizes[$s]['height'] = intval( $_wp_additional_image_sizes[$s]['height'] ); // For theme-added sizes
-                        else
-                                $sizes[$s]['height'] = get_option( "{$s}_size_h" ); // For default sizes set in options
-                        if ( isset( $_wp_additional_image_sizes[$s]['crop'] ) )
-                                $sizes[$s]['crop'] = intval( $_wp_additional_image_sizes[$s]['crop'] ); // For theme-added sizes
-                        else
-                                $sizes[$s]['crop'] = get_option( "{$s}_crop" ); // For default sizes set in options
+                        $sizes[ $s ] = array( 'width' => 0, 'height' => 0, 'crop' => false );
+                        // For theme-added sizes
+                        if ( isset( $_wp_additional_image_sizes[ $s ] ) ) {
+                                $sizes[ $s ] = $_wp_additional_image_sizes[ $s ];
+                        } else /* For default sizes set in options */ {
+                                $sizes[ $s ]['width'] = intval( get_option( "{$s}_size_w" ) );
+                                $sizes[ $s ]['height'] = intval( get_option( "{$s}_size_h" ) );
+                                $sizes[ $s ]['crop'] = (bool) get_option( "{$s}_crop" );
+                        }
                 }
 
                 $sizes = apply_filters( 'intermediate_image_sizes_advanced', $sizes );