diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index 849e15ac76..58723ebc0d 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -553,16 +553,17 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 		$attachment_id        = get_query_var( 'attachment_id' );
 		$attachment_post      = get_post( $attachment_id );
 		$attachment_parent_id = $attachment_post ? $attachment_post->post_parent : 0;
+		$attachment_url       = wp_get_attachment_url( $attachment_id );
 
-		$attachment_url = wp_get_attachment_url( $attachment_id );
 		if ( $attachment_url !== $redirect_url ) {
 			/*
-			* If an attachment is attached to a post, it inherits the parent post's status. Fetch the
-			* parent post to check its status later.
-			*/
+			 * If an attachment is attached to a post, it inherits the parent post's status.
+			 * Fetch the parent post to check its status later.
+			 */
 			if ( $attachment_parent_id ) {
 				$redirect_obj = get_post( $attachment_parent_id );
 			}
+
 			$redirect_url = $attachment_url;
 		}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c4b96a8cf3..447ccadbff 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.7-alpha-58923';
+$wp_version = '6.7-alpha-58924';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.