WordPress.org

Make WordPress Core

Ticket #22100: 22100.diff

File 22100.diff, 9.8 KB (added by scribu, 6 years ago)
  • wp-admin/includes/image.php

    diff --git wp-admin/includes/image.php wp-admin/includes/image.php
    index 2a5123e..9600790 100644
    function wp_generate_attachment_metadata( $attachment_id, $file ) { 
    7272                // Make the file path relative to the upload dir
    7373                $metadata['file'] = _wp_relative_upload_path($file);
    7474
    75                 // make thumbnails and other intermediate sizes
    76                 global $_wp_additional_image_sizes;
    77 
    78                 foreach ( get_intermediate_image_sizes() as $s ) {
    79                         $sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => false );
    80                         if ( isset( $_wp_additional_image_sizes[$s]['width'] ) )
    81                                 $sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] ); // For theme-added sizes
    82                         else
    83                                 $sizes[$s]['width'] = get_option( "{$s}_size_w" ); // For default sizes set in options
    84                         if ( isset( $_wp_additional_image_sizes[$s]['height'] ) )
    85                                 $sizes[$s]['height'] = intval( $_wp_additional_image_sizes[$s]['height'] ); // For theme-added sizes
    86                         else
    87                                 $sizes[$s]['height'] = get_option( "{$s}_size_h" ); // For default sizes set in options
    88                         if ( isset( $_wp_additional_image_sizes[$s]['crop'] ) )
    89                                 $sizes[$s]['crop'] = intval( $_wp_additional_image_sizes[$s]['crop'] ); // For theme-added sizes
    90                         else
    91                                 $sizes[$s]['crop'] = get_option( "{$s}_crop" ); // For default sizes set in options
     75                $sizes = array();
     76
     77                foreach ( get_intermediate_image_sizes( array( 'pregenerate' => true ), 'objects' ) as $name => $size ) {
     78                        $sizes[ $name ] = array(
     79                                'width' => $size->width,
     80                                'height' => $size->height,
     81                                'crop' => $size->crop,
     82                        );
    9283                }
    9384
    9485                $sizes = apply_filters( 'intermediate_image_sizes_advanced', $sizes );
  • wp-admin/includes/meta-boxes.php

    diff --git wp-admin/includes/meta-boxes.php wp-admin/includes/meta-boxes.php
    index f099627..0321aff 100644
    function link_advanced_meta_box($link) { 
    10111011 * @since 2.9.0
    10121012 */
    10131013function post_thumbnail_meta_box( $post ) {
    1014         global $_wp_additional_image_sizes;
    1015 
    10161014        ?><script type="text/javascript">
    10171015        jQuery( function($) {
    10181016                var $element     = $('#select-featured-image'),
    function post_thumbnail_meta_box( $post ) { 
    10731071
    10741072        <?php
    10751073        $thumbnail_id   = get_post_meta( $post->ID, '_thumbnail_id', true );
    1076         $thumbnail_size = isset( $_wp_additional_image_sizes['post-thumbnail'] ) ? 'post-thumbnail' : 'medium';
     1074        $thumbnail_size = image_size_exists( 'post-thumbnail' ) ? 'post-thumbnail' : 'medium';
    10771075        $thumbnail_html = wp_get_attachment_image( $thumbnail_id, $thumbnail_size );
    10781076
    10791077        $classes = empty( $thumbnail_id ) ? '' : 'has-featured-image';
    function post_thumbnail_meta_box( $post ) { 
    10871085                <a href="#" class="remove"><?php _e( 'Remove Featured Image' ); ?></a>
    10881086        </div>
    10891087        <?php
    1090 }
    1091  No newline at end of file
     1088}
  • wp-admin/includes/post.php

    diff --git wp-admin/includes/post.php wp-admin/includes/post.php
    index 44bc7c2..740817c 100644
    function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) { 
    11241124 * @return string html
    11251125 */
    11261126function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
    1127         global $content_width, $_wp_additional_image_sizes;
     1127        global $content_width;
    11281128
    11291129        $post = get_post( $post );
    11301130
    function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) { 
    11351135        if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
    11361136                $old_content_width = $content_width;
    11371137                $content_width = 266;
    1138                 if ( !isset( $_wp_additional_image_sizes['post-thumbnail'] ) )
     1138                if ( !image_size_exists( 'post-thumbnail' ) )
    11391139                        $thumbnail_html = wp_get_attachment_image( $thumbnail_id, array( $content_width, $content_width ) );
    11401140                else
    11411141                        $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'post-thumbnail' );
  • wp-includes/media.php

    diff --git wp-includes/media.php wp-includes/media.php
    index 1fc4383..fdd0db7 100644
     
    3232 * @return array Width and height of what the result image should resize to.
    3333 */
    3434function image_constrain_size_for_editor($width, $height, $size = 'medium') {
    35         global $content_width, $_wp_additional_image_sizes;
     35        global $content_width;
     36
     37        if ( 'thumb' == $size )
     38                $size = 'thumbnail';
    3639
    3740        if ( is_array($size) ) {
    38                 $max_width = $size[0];
    39                 $max_height = $size[1];
    40         }
    41         elseif ( $size == 'thumb' || $size == 'thumbnail' ) {
    42                 $max_width = intval(get_option('thumbnail_size_w'));
    43                 $max_height = intval(get_option('thumbnail_size_h'));
    44                 // last chance thumbnail size defaults
    45                 if ( !$max_width && !$max_height ) {
    46                         $max_width = 128;
    47                         $max_height = 96;
    48                 }
    49         }
    50         elseif ( $size == 'medium' ) {
    51                 $max_width = intval(get_option('medium_size_w'));
    52                 $max_height = intval(get_option('medium_size_h'));
    53                 // if no width is set, default to the theme content width if available
     41                list( $max_width, $max_height ) = $size;
    5442        }
    55         elseif ( $size == 'large' ) {
    56                 // We're inserting a large size image into the editor. If it's a really
    57                 // big image we'll scale it down to fit reasonably within the editor
    58                 // itself, and within the theme's content width if it's known. The user
    59                 // can resize it in the editor if they wish.
    60                 $max_width = intval(get_option('large_size_w'));
    61                 $max_height = intval(get_option('large_size_h'));
    62                 if ( intval($content_width) > 0 )
    63                         $max_width = min( intval($content_width), $max_width );
    64         } elseif ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
    65                 $max_width = intval( $_wp_additional_image_sizes[$size]['width'] );
    66                 $max_height = intval( $_wp_additional_image_sizes[$size]['height'] );
    67                 if ( intval($content_width) > 0 && is_admin() ) // Only in admin. Assume that theme authors know what they're doing.
     43        elseif ( image_size_exists( $size ) ) {
     44                $size_obj = get_image_size( $size );
     45
     46                $max_width = $size_obj->width;
     47                $max_height = $size_obj->height;
     48
     49                if ( intval( $content_width ) > 0 && ( 'large' == $size || is_admin() ) )
    6850                        $max_width = min( intval($content_width), $max_width );
    6951        }
    7052        // $size == 'full' has no constraint
    function image_downsize($id, $size = 'medium') { 
    179161 * Registers a new image size
    180162 *
    181163 * @since 2.9.0
     164 *
     165 * TODO: deprecate
    182166 */
    183167function add_image_size( $name, $width = 0, $height = 0, $crop = false ) {
    184         global $_wp_additional_image_sizes;
    185         $_wp_additional_image_sizes[$name] = array( 'width' => absint( $width ), 'height' => absint( $height ), 'crop' => (bool) $crop );
     168        register_image_size( $name, compact( 'width', 'height', 'crop' ) );
     169}
     170
     171/**
     172 * Register a new image size.
     173 *
     174 * @since 3.6.0
     175 *
     176 * @param string $name Image size name
     177 * @param array|string $args See optional args description above
     178 */
     179function register_image_size( $name, $args ) {
     180        global $wp_image_sizes;
     181
     182        if ( !is_array( $wp_image_sizes ) )
     183                $wp_image_sizes = array();
     184
     185        $defaults = array(
     186                'width' => 0,
     187                'height' => 0,
     188                'crop' => false,
     189                'pregenerate' => true
     190        );
     191
     192        $args = wp_parse_args( $args, $defaults );
     193
     194        $size = new stdClass;
     195
     196        $size->name = $name;
     197        $size->width = absint( $args['width'] );
     198        $size->height = absint( $args['height'] );
     199        $size->crop = (bool) $args['crop'];
     200        $size->pregenerate = (bool) $args['pregenerate'];
     201
     202        $wp_image_sizes[ $name ] = $size;
     203}
     204
     205/**
     206 * Get a registered image size object by name.
     207 *
     208 * @since 3.6.0
     209 *
     210 * @param string $image_size Image size name
     211 * @return object
     212 */
     213function get_image_size( $image_size ) {
     214        global $wp_image_sizes;
     215
     216        if ( empty( $wp_image_sizes[ $image_size ] ) )
     217                return null;
     218
     219        return $wp_image_sizes[ $image_size ];
    186220}
    187221
    188222/**
     223 * Checks if an image size is registered.
     224 *
     225 * @since 3.6.0
     226 *
     227 * @param string $image_size Image size name
     228 * @return bool
     229 */
     230function image_size_exists( $image_size ) {
     231        return (bool) get_image_size( $image_size );
     232}
     233
     234/**
     235 * Get the available image sizes.
     236 *
     237 * @since 3.0.0
     238 *
     239 * @return array
     240 */
     241function get_intermediate_image_sizes( $args = array(), $output = 'names', $operator = 'and' ) {
     242        global $wp_image_sizes;
     243
     244        $field = ( 'names' == $output ) ? 'name' : false;
     245
     246        $list = wp_filter_object_list( $wp_image_sizes, $args, $operator, $field );
     247
     248        if ( 'names' == $output )
     249                return apply_filters( 'intermediate_image_sizes', $list );
     250
     251        return $list;
     252}
     253
     254function create_initial_image_sizes() {
     255        foreach ( array( 'thumbnail', 'medium', 'large' ) as $s ) {
     256                $args = array(
     257                        'width' => get_option( "{$s}_size_w" ),
     258                        'height' => get_option( "{$s}_size_h" ),
     259                        'crop' => get_option( "{$s}_crop" ),
     260                        'pregenerate' => true
     261                );
     262
     263                register_image_size( $s, $args );
     264        }
     265}
     266add_action( 'init', 'create_initial_image_sizes', 0 ); // highest priority
     267
     268/**
    189269 * Registers an image size for the post thumbnail
    190270 *
    191271 * @since 2.9.0
    192272 */
    193273function set_post_thumbnail_size( $width = 0, $height = 0, $crop = false ) {
    194         add_image_size( 'post-thumbnail', $width, $height, $crop );
     274        register_image_size( 'post-thumbnail', array(
     275                'width' => $width,
     276                'height' => $height,
     277                'crop' => $crop,
     278                'pregenerate' => false
     279        ) );
    195280}
    196281
    197282/**
    function image_get_intermediate_size($post_id, $size='thumbnail') { 
    473558}
    474559
    475560/**
    476  * Get the available image sizes
    477  * @since 3.0.0
    478  * @return array Returns a filtered array of image size strings
    479  */
    480 function get_intermediate_image_sizes() {
    481         global $_wp_additional_image_sizes;
    482         $image_sizes = array('thumbnail', 'medium', 'large'); // Standard sizes
    483         if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
    484                 $image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
    485 
    486         return apply_filters( 'intermediate_image_sizes', $image_sizes );
    487 }
    488 
    489 /**
    490561 * Retrieve an image to represent an attachment.
    491562 *
    492563 * A mime icon for files, thumbnail or intermediate size for images.