Ticket #22100: 22100.3.diff

wp-admin/includes/image.php

@@ -72 +72 @@
                 // Make the file path relative to the upload dir
                 $metadata['file'] = _wp_relative_upload_path($file);
 
-                // make thumbnails and other intermediate sizes
-                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 = array();
+
+                foreach ( get_intermediate_image_sizes( array(), 'objects' ) as $name => $size ) {
+                        $sizes[ $name ] = array(
+                                'width' => $size->width,
+                                'height' => $size->height,
+                                'crop' => $size->crop,
+                        );
                 }
 
                 $sizes = apply_filters( 'intermediate_image_sizes_advanced', $sizes );

wp-admin/includes/meta-boxes.php

@@ -1011 +1011 @@
  * @since 2.9.0
  */
 function post_thumbnail_meta_box( $post ) {
-        global $_wp_additional_image_sizes;
-
         ?><script type="text/javascript">
         jQuery( function($) {
                 var $element     = $('#select-featured-image'),
@@ -1073 +1071 @@
 
         <?php
         $thumbnail_id   = get_post_meta( $post->ID, '_thumbnail_id', true );
-        $thumbnail_size = isset( $_wp_additional_image_sizes['post-thumbnail'] ) ? 'post-thumbnail' : 'medium';
+        $thumbnail_size = image_size_exists( 'post-thumbnail' ) ? 'post-thumbnail' : 'medium';
         $thumbnail_html = wp_get_attachment_image( $thumbnail_id, $thumbnail_size );
 
         $classes = empty( $thumbnail_id ) ? '' : 'has-featured-image';
@@ -1087 +1085 @@
                 <a href="#" class="remove"><?php _e( 'Remove Featured Image' ); ?></a>
         </div>
         <?php
-}
- No newline at end of file
+}

wp-admin/includes/post.php

@@ -1124 +1124 @@
  * @return string html
  */
 function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
-        global $content_width, $_wp_additional_image_sizes;
+        global $content_width;
 
         $post = get_post( $post );
 
@@ -1135 +1135 @@
         if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
                 $old_content_width = $content_width;
                 $content_width = 266;
-                if ( !isset( $_wp_additional_image_sizes['post-thumbnail'] ) )
+                if ( !image_size_exists( 'post-thumbnail' ) )
                         $thumbnail_html = wp_get_attachment_image( $thumbnail_id, array( $content_width, $content_width ) );
                 else
                         $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'post-thumbnail' );

wp-includes/functions.php

@@ -2584 +2584 @@
 }
 
 /**
+ * Convert a numeric array to an associative array, based on a list of keys.
+ *
+ * @since 3.6.0
+ *
+ * @param array $list Numeric array to be converted
+ * @param array $keys A list of keys
+ * @return array Resulting array
+ */
+function wp_numeric_to_assoc( $vector, $keys ) {
+        $assoc = array();
+
+        foreach ( $keys as $i => $key ) {
+                if ( isset( $vector[ $i ] ) )
+                        $assoc[ $key ] = $vector[ $i ];
+                else
+                        break;
+        }
+
+        return $assoc;
+}
+
+/**
  * Determines if Widgets library should be loaded.
  *
  * Checks to make sure that the widgets library hasn't already been loaded. If
@@ -3781 +3803 @@
 function wp_checkdate( $month, $day, $year, $source_date ) {
         return apply_filters( 'wp_checkdate', checkdate( $month, $day, $year ), $source_date );
 }
+

wp-includes/media.php

@@ -32 +32 @@
  * @return array Width and height of what the result image should resize to.
  */
 function image_constrain_size_for_editor($width, $height, $size = 'medium') {
-        global $content_width, $_wp_additional_image_sizes;
+        global $content_width;
+
+        if ( 'thumb' == $size )
+                $size = 'thumbnail';
 
         if ( is_array($size) ) {
-                $max_width = $size[0];
-                $max_height = $size[1];
-        }
-        elseif ( $size == 'thumb' || $size == 'thumbnail' ) {
-                $max_width = intval(get_option('thumbnail_size_w'));
-                $max_height = intval(get_option('thumbnail_size_h'));
-                // last chance thumbnail size defaults
-                if ( !$max_width && !$max_height ) {
-                        $max_width = 128;
-                        $max_height = 96;
-                }
-        }
-        elseif ( $size == 'medium' ) {
-                $max_width = intval(get_option('medium_size_w'));
-                $max_height = intval(get_option('medium_size_h'));
-                // if no width is set, default to the theme content width if available
+                list( $max_width, $max_height ) = $size;
         }
-        elseif ( $size == 'large' ) {
-                // We're inserting a large size image into the editor. If it's a really
-                // big image we'll scale it down to fit reasonably within the editor
-                // itself, and within the theme's content width if it's known. The user
-                // can resize it in the editor if they wish.
-                $max_width = intval(get_option('large_size_w'));
-                $max_height = intval(get_option('large_size_h'));
-                if ( intval($content_width) > 0 )
-                        $max_width = min( intval($content_width), $max_width );
-        } elseif ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
-                $max_width = intval( $_wp_additional_image_sizes[$size]['width'] );
-                $max_height = intval( $_wp_additional_image_sizes[$size]['height'] );
-                if ( intval($content_width) > 0 && is_admin() ) // Only in admin. Assume that theme authors know what they're doing.
+        elseif ( image_size_exists( $size ) ) {
+                $size_obj = get_image_size( $size );
+
+                $max_width = $size_obj->width;
+                $max_height = $size_obj->height;
+
+                if ( intval( $content_width ) > 0 && ( 'large' == $size || is_admin() ) )
                         $max_width = min( intval($content_width), $max_width );
         }
         // $size == 'full' has no constraint
@@ -176 +158 @@
 }
 
 /**
- * Registers a new image size
+ * Register a new image size.
  *
  * @since 2.9.0
+ *
+ * @param string $name The new image size name
+ * @param array $args The new image size parameters
+ */
+function add_image_size( $name, $args ) {
+        if ( !is_array( $args ) ) {
+                $argv = func_get_args();
+                $name = array_shift( $argv );
+                $args = wp_numeric_to_assoc( $argv, array( 'width', 'height', 'crop' ) );
+        }
+
+        $defaults = array(
+                'width' => 0,
+                'height' => 0,
+                'crop' => false,
+        );
+
+        $args = array_merge( $defaults, $args );
+
+        $size = new stdClass;
+
+        $size->name = $name;
+        $size->width = absint( $args['width'] );
+        $size->height = absint( $args['height'] );
+        $size->crop = (bool) $args['crop'];
+
+        global $wp_image_sizes;
+
+        if ( !is_array( $wp_image_sizes ) )
+                $wp_image_sizes = array();
+
+        $wp_image_sizes[ $name ] = $size;
+}
+
+/**
+ * Get a registered image size object by name.
+ *
+ * @since 3.5.0
+ *
+ * @param string $image_size Image size name
+ * @return object
+ */
+function get_image_size( $image_size ) {
+        global $wp_image_sizes;
+
+        if ( empty( $wp_image_sizes[ $image_size ] ) )
+                return null;
+
+        return $wp_image_sizes[ $image_size ];
+}
+
+/**
+ * Checks if an image size is registered.
+ *
+ * @since 3.5.0
+ *
+ * @param string $image_size Image size name
+ * @return bool
  */
-function add_image_size( $name, $width = 0, $height = 0, $crop = false ) {
-        global $_wp_additional_image_sizes;
-        $_wp_additional_image_sizes[$name] = array( 'width' => absint( $width ), 'height' => absint( $height ), 'crop' => (bool) $crop );
+function image_size_exists( $image_size ) {
+        return (bool) get_image_size( $image_size );
 }
 
 /**
+ * Get the available image sizes.
+ *
+ * @since 3.0.0
+ *
+ * @return array
+ */
+function get_intermediate_image_sizes( $args = array(), $output = 'names', $operator = 'and' ) {
+        global $wp_image_sizes;
+
+        $field = ( 'names' == $output ) ? 'name' : false;
+
+        $list = wp_filter_object_list( $wp_image_sizes, $args, $operator, $field );
+
+        if ( 'names' == $output )
+                return apply_filters( 'intermediate_image_sizes', $list );
+
+        return $list;
+}
+
+function create_initial_image_sizes() {
+        foreach ( array( 'thumbnail', 'medium', 'large' ) as $s ) {
+                $args = array(
+                        'width' => get_option( "{$s}_size_w" ),
+                        'height' => get_option( "{$s}_size_h" ),
+                        'crop' => get_option( "{$s}_crop" ),
+                );
+
+                add_image_size( $s, $args );
+        }
+}
+add_action( 'init', 'create_initial_image_sizes', 0 ); // highest priority
+
+/**
  * Registers an image size for the post thumbnail
  *
  * @since 2.9.0
  */
 function set_post_thumbnail_size( $width = 0, $height = 0, $crop = false ) {
-        add_image_size( 'post-thumbnail', $width, $height, $crop );
+        add_image_size( 'post-thumbnail', array(
+                'width' => $width,
+                'height' => $height,
+                'crop' => $crop,
+        ) );
 }
 
 /**
@@ -473 +549 @@
 }
 
 /**
- * Get the available image sizes
- * @since 3.0.0
- * @return array Returns a filtered array of image size strings
- */
-function get_intermediate_image_sizes() {
-        global $_wp_additional_image_sizes;
-        $image_sizes = array('thumbnail', 'medium', 'large'); // Standard sizes
-        if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
-                $image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
-
-        return apply_filters( 'intermediate_image_sizes', $image_sizes );
-}
-
-/**
  * Retrieve an image to represent an attachment.
  *
  * A mime icon for files, thumbnail or intermediate size for images.