Changeset 53685 for trunk/src/wp-includes/media.php

Timestamp:

07/07/2022 11:30:21 PM (4 years ago)

Author:

azaozz

Message:

Media:

• Deprecate wp_get_attachment_thumb_file().
• Make wp_get_attachment_thumb_url() an alias of wp_get_attachment_image_url(). This fixes it to return the proper thumbnail URL and fall back to returning the URL to image_meta['thumb'] if only that exists.

Props: markhowellsmead, mukesh27, csesumonpro, SergeyBiryukov, mikeschroder, killua99, joemcgill, mashukushibiki, mfgmicha, swissspidy, romulodl, nacin, JoshuaAbenazer, wonderboymusic, lonnylot, azaozz.

File:

• trunk/src/wp-includes/media.php (modified) (1 diff)

trunk/src/wp-includes/media.php

@@ -239 +239 @@
                 $height          = $intermediate['height'];
                 $is_intermediate = true;
-        } elseif ( 'thumbnail' === $size ) {
+        } elseif ( 'thumbnail' === $size && ! empty( $meta['thumb'] ) && is_string( $meta['thumb'] ) ) {
                 // Fall back to the old thumbnail.
-                $thumb_file = wp_get_attachment_thumb_file( $id );
-                $info       = null;
-
-                if ( $thumb_file ) {
-                        $info = wp_getimagesize( $thumb_file );
-                }
-
-                if ( $thumb_file && $info ) {
-                        $img_url         = str_replace( $img_url_basename, wp_basename( $thumb_file ), $img_url );
-                        $width           = $info[0];
-                        $height          = $info[1];
-                        $is_intermediate = true;
+                $imagefile = get_attached_file( $id );
+                $thumbfile = str_replace( wp_basename( $imagefile ), wp_basename( $meta['thumb'] ), $imagefile );
+
+                if ( file_exists( $thumbfile ) ) {
+                        $info = wp_getimagesize( $thumbfile );
+
+                        if ( $info ) {
+                                $img_url         = str_replace( $img_url_basename, wp_basename( $thumbfile ), $img_url );
+                                $width           = $info[0];
+                                $height          = $info[1];
+                                $is_intermediate = true;
+                        }
                 }
         }