Changeset 45539

Timestamp:

06/15/2019 01:31:07 AM (7 years ago)

Author:

azaozz

Message:

After [45538]: fix a WPCS fix and make couple of var names consistent.

See #40439.

Location:

trunk/src

Files:

• wp-admin/includes/image.php (modified) (2 diffs)
• wp-includes/media.php (modified) (1 diff)

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

@@ -88 +88 @@
         // Meta error?
         if ( empty( $image_meta ) ) {
-                return $defined_sizes;
+                return $registered_sizes;
         }
 
@@ -380 +380 @@
                 $fallback_sizes = apply_filters( 'fallback_intermediate_image_sizes', $fallback_sizes, $metadata );
 
-                $defined_sizes = wp_get_registered_image_subsizes();
-                $merged_sizes  = array_intersect_key( $defined_sizes, array_flip( $fallback_sizes ) );
+                $registered_sizes = wp_get_registered_image_subsizes();
+                $merged_sizes     = array_intersect_key( $registered_sizes, array_flip( $fallback_sizes ) );
 
                 // Force thumbnails to be soft crops.

trunk/src/wp-includes/media.php

@@ -236 +236 @@
                 // fall back to the old thumbnail
                 $thumb_file = wp_get_attachment_thumb_file( $id );
-                $info       = getimagesize( $thumb_file );
+                $info       = null;
+
+                if ( $thumb_file ) {
+                        $info = getimagesize( $thumb_file );
+                }
 
                 if ( $thumb_file && $info ) {