← Back to branch summary

~canonical-sysadmins/wordpress/5.1

« back to all changes in this revision

Viewing changes to wp-admin/includes/image.php

  • Committer: Jamon Camisso
  • Date: 2017-01-12 15:30:45 UTC
  • mto: This revision was merged to the branch mainline in revision 25.
  • Revision ID: jamon.camisso@canonical.com-20170112153045-dekfwsu8mcsdxa7x
New upstream release 4.7.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-admin/includes/image.php
221
221
                $fallback_sizes = apply_filters( 'fallback_intermediate_image_sizes', $fallback_sizes, $metadata );
222
222
 
223
223
                $sizes = array();
 
224
                $_wp_additional_image_sizes = wp_get_additional_image_sizes();
224
225
 
225
226
                foreach ( $fallback_sizes as $s ) {
226
 
                        $sizes[ $s ]['width']  = get_option( "{$s}_size_w" );
227
 
                        $sizes[ $s ]['height'] = get_option( "{$s}_size_h" );
228
 
 
229
 
                        // Force thumbnails to be soft crops.
230
 
                        if ( ! 'thumbnail' === $s ) {
231
 
                                $sizes[ $s ]['crop'] = get_option( "{$s}_crop" );
 
227
                        if ( isset( $_wp_additional_image_sizes[ $s ]['width'] ) ) {
 
228
                                $sizes[ $s ]['width'] = intval( $_wp_additional_image_sizes[ $s ]['width'] );
 
229
                        } else {
 
230
                                $sizes[ $s ]['width'] = get_option( "{$s}_size_w" );
 
231
                        }
 
232
 
 
233
                        if ( isset( $_wp_additional_image_sizes[ $s ]['height'] ) ) {
 
234
                                $sizes[ $s ]['height'] = intval( $_wp_additional_image_sizes[ $s ]['height'] );
 
235
                        } else {
 
236
                                $sizes[ $s ]['height'] = get_option( "{$s}_size_h" );
 
237
                        }
 
238
 
 
239
                        if ( isset( $_wp_additional_image_sizes[ $s ]['crop'] ) ) {
 
240
                                $sizes[ $s ]['crop'] = $_wp_additional_image_sizes[ $s ]['crop'];
 
241
                        } else {
 
242
                                // Force thumbnails to be soft crops.
 
243
                                if ( ! 'thumbnail' === $s ) {
 
244
                                        $sizes[ $s ]['crop'] = get_option( "{$s}_crop" );
 
245
                                }
232
246
                        }
233
247
                }
234
248