Ticket #17262: 17262.inter-diff-9-10.diff

src/wp-admin/includes/deprecated.php

@@ -1514 +1514 @@
         </script>
         <?php
 }
+
+
+/**
+ * Retrieve thumbnail for an attachment.
+ *
+ * @since 2.1.0
+ * @deprecated 5.2 Use wp_get_attachment_image_file( $attachment_id, $size = 'thumbnail' )
+ *
+ * @param int $post_id Optional. Attachment ID. Default 0.
+ * @return string|false False on failure. Thumbnail file path on success.
+ */
+function wp_get_attachment_thumb_file( $post_id = 0 ) {
+        _deprecated_function( __FUNCTION__, '5.2' );
+
+        $file = wp_get_attachment_image_file( $post_id );
+
+        if ( $file ) {
+                /**
+                 * Filters the attachment thumbnail file path.
+                 *
+                 * @since 2.1.0
+                 * @deprecated 5.2 Use filter wp_get_attachment_image_file( $file, $attachment_id, $size )
+                 *
+                 * @param string $thumbfile File path to the attachment thumbnail.
+                 * @param int    $post_id   Attachment ID.
+                 */
+                return apply_filters( 'wp_get_attachment_thumb_file', $file, $post->ID );
+        }
+        return false;
+}

src/wp-includes/media.php

@@ -948 +948 @@
 /**
  * Get the size path of an image attachment.
  *
+ * @since 5.2
+ *
  * @param int          $attachment_id Attachment ID.
- * @param string|array $size Optional. Image size to retrieve. Accepts any valid image size, or an array
- *                           of width and height values. Default 'thumbnail'
+ * @param string|array $size          Optional. Image size to retrieve. Accepts any valid image size, or an array
+ *                                    of width and height values. Default 'thumbnail'
  *
  * @return string|null Attachment path or null if no image is available.
  */
@@ -980 +982 @@
 
         $path = $wp_upload_dir['basedir'] . '/' . trailingslashit( $file_path ) . $file_name;
 
-        return $path;
-
+        /**
+         * Filters the attachment image file path.
+         *
+         * @since 5.2
+         *
+         * @param string $path          File path to the image file.
+         * @param int    $attachment_id Attachment ID.
+         * @param string $size          Image size used to get the size.
+         */
+        return apply_filters( 'wp_get_attachment_image_file', $path, $attachment_id, $size );
 }
 
 

src/wp-includes/post.php

@@ -5685 +5685 @@
         return apply_filters( 'wp_get_attachment_caption', $caption, $post->ID );
 }
 
-/**
- * Retrieve thumbnail for an attachment.
- *
- * @since 2.1.0
- * @deprecated 5.2 Use wp_get_attachment_image_file( $attachment_id, $size = 'thumbnail' )
- *
- * @param int $post_id Optional. Attachment ID. Default 0.
- * @return string|false False on failure. Thumbnail file path on success.
- */
-function wp_get_attachment_thumb_file( $post_id = 0 ) {
-        $post_id = (int) $post_id;
-        if ( ! $post = get_post( $post_id ) ) {
-                return false;
-        }
-        if ( ! is_array( $imagedata = wp_get_attachment_metadata( $post->ID ) ) ) {
-                return false;
-        }
-
-        $file = get_attached_file( $post->ID );
-
-        if ( ! empty( $imagedata['thumb'] ) && ( $thumbfile = str_replace( wp_basename( $file ), $imagedata['thumb'], $file ) ) && file_exists( $thumbfile ) ) {
-                /**
-                 * Filters the attachment thumbnail file path.
-                 *
-                 * @since 2.1.0
-                 *
-                 * @param string $thumbfile File path to the attachment thumbnail.
-                 * @param int    $post_id   Attachment ID.
-                 */
-                return apply_filters( 'wp_get_attachment_thumb_file', $thumbfile, $post->ID );
-        }
-        return false;
-}
-
 /**
  * Retrieve URL for an attachment thumbnail.
  *