From b108d4db71f8559a60b673eae4ee1e3139a74a08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Helen=20Hou-Sand=C3=AD?= <helen.y.hou@gmail.com>
Date: Thu, 1 Oct 2020 17:55:06 +0000
Subject: [PATCH] Media: Don't unnecessarily check for a valid attachment
 before getting meta.

This makes `wp_get_attachment_metadata()` run significantly faster. See ticket for benchmarking.

Props Tkama, donmhico.
Fixes #50679.

Built from https://develop.svn.wordpress.org/trunk@49084


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

diff --git a/wp-includes/post.php b/wp-includes/post.php
index 0fda61ab85..575a2fbaea 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -5992,13 +5992,12 @@ function wp_delete_attachment_files( $post_id, $meta, $backup_sizes, $file ) {
 function wp_get_attachment_metadata( $attachment_id = 0, $unfiltered = false ) {
 	$attachment_id = (int) $attachment_id;
 
-	$post = get_post( $attachment_id );
-	if ( ! $post ) {
+	$data = get_post_meta( $attachment_id, '_wp_attachment_metadata', true );
+
+	if ( empty( $data ) ) {
 		return false;
 	}
 
-	$data = get_post_meta( $post->ID, '_wp_attachment_metadata', true );
-
 	if ( $unfiltered ) {
 		return $data;
 	}
@@ -6012,7 +6011,7 @@ function wp_get_attachment_metadata( $attachment_id = 0, $unfiltered = false ) {
 	 *                                  if the object does not exist.
 	 * @param int        $attachment_id Attachment post ID.
 	 */
-	return apply_filters( 'wp_get_attachment_metadata', $data, $post->ID );
+	return apply_filters( 'wp_get_attachment_metadata', $data, $attachment_id );
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 584b6ae5d3..d44dcc8df2 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.6-alpha-49083';
+$wp_version = '5.6-alpha-49084';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.