From e9d290a104aed79e18cd83c4cfd28a9353eb076f Mon Sep 17 00:00:00 2001
From: Andrew Ozz <admin@laptoptips.ca>
Date: Wed, 1 Mar 2023 00:36:24 +0000
Subject: [PATCH] Media: Revert the addition of a `$size` parameter to
 `get_attached_file()`.

Reverts [55199], [55202], and [55217] but keeps the updated docs.

Props: flixos90, joedolson, azaozz.
Fixes: #51780.
Built from https://develop.svn.wordpress.org/trunk@55437


git-svn-id: http://core.svn.wordpress.org/trunk@54970 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/post.php    | 31 ++++++-------------------------
 wp-includes/version.php |  2 +-
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/wp-includes/post.php b/wp-includes/post.php
index f1ad0bde5f..dc9fb5771a 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -705,8 +705,6 @@ function create_initial_post_types() {
 /**
  * Retrieves attached file path based on attachment ID.
  *
- * Will return intermediate size path if the `$size` parameter is provided.
- *
  * By default the path will go through the {@see 'get_attached_file'} filter, but
  * passing `true` to the `$unfiltered` argument will return the file path unfiltered.
  *
@@ -715,28 +713,14 @@ function create_initial_post_types() {
  * a mechanism for sending the attached filename through a filter.
  *
  * @since 2.0.0
- * @since 6.2.0 The `$size` parameter was added.
  *
- * @param int          $attachment_id Attachment ID.
- * @param bool         $unfiltered    Optional. Whether to skip the {@see 'get_attached_file'} filter.
- *                                    Default false.
- * @param string|int[] $size          Optional. Image size. Accepts any registered image size name, or an array
- *                                    of width and height values in pixels (in that order). Default empty string.
+ * @param int  $attachment_id Attachment ID.
+ * @param bool $unfiltered    Optional. Whether to skip the {@see 'get_attached_file'} filter.
+ *                            Default false.
  * @return string|false The file path to where the attached file should be, false otherwise.
  */
-function get_attached_file( $attachment_id, $unfiltered = false, $size = '' ) {
-
-	// Check for intermediate sizes first, otherwise fall back to the original attachment size.
-	if ( ! empty( $size ) ) {
-		$intermediate_image = image_get_intermediate_size( $attachment_id, $size );
-		if ( ! $intermediate_image || ! isset( $intermediate_image['path'] ) ) {
-			return false;
-		}
-
-		$file = $intermediate_image['path'];
-	} else {
-		$file = get_post_meta( $attachment_id, '_wp_attached_file', true );
-	}
+function get_attached_file( $attachment_id, $unfiltered = false ) {
+	$file = get_post_meta( $attachment_id, '_wp_attached_file', true );
 
 	// If the file is relative, prepend upload dir.
 	if ( $file && 0 !== strpos( $file, '/' ) && ! preg_match( '|^.:\\\|', $file ) ) {
@@ -754,14 +738,11 @@ function get_attached_file( $attachment_id, $unfiltered = false, $size = '' ) {
 	 * Filters the attached file based on the given ID.
 	 *
 	 * @since 2.1.0
-	 * @since 6.2.0 The `$size` parameter was added.
 	 *
 	 * @param string|false $file          The file path to where the attached file should be, false otherwise.
 	 * @param int          $attachment_id Attachment ID.
-	 * @param string|int[] $size          Optional. Image size. Accepts any registered image size name, or an array
-	 *                                    of width and height values in pixels (in that order). Default empty string.
 	 */
-	return apply_filters( 'get_attached_file', $file, $attachment_id, $size );
+	return apply_filters( 'get_attached_file', $file, $attachment_id );
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e9b08012b8..f067e63239 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.2-beta3-55436';
+$wp_version = '6.2-beta3-55437';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.