From b6392f5cfd6fdf13dfdc6c8ad440f4c1ee5f5a2e Mon Sep 17 00:00:00 2001
From: Sukhendu Sekhar Guria <sukhendu.guria@rtcamp.com>
Date: Mon, 20 Apr 2026 12:21:34 +0530
Subject: [PATCH 1/3] Embeds: Fix get_site_icon_url() dropping fallback when
 attachment URL fails

---
 src/wp-includes/embed.php            | 18 +++++++++++++++---
 src/wp-includes/general-template.php |  5 ++++-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/embed.php b/src/wp-includes/embed.php
index 3fb8968c7c62c..24e6abf2b4de1 100644
--- a/src/wp-includes/embed.php
+++ b/src/wp-includes/embed.php
@@ -1233,11 +1233,23 @@ function print_embed_sharing_dialog() {
  * @since 4.5.0
  */
 function the_embed_site_title() {
+	$site_icon_url    = get_site_icon_url( 32, includes_url( 'images/w-logo-blue.png' ) );
+	$site_icon_url_2x = get_site_icon_url( 64, includes_url( 'images/w-logo-blue.png' ) );
+
+	$icon_img = '';
+	if ( $site_icon_url ) {
+		$srcset   = $site_icon_url_2x ? sprintf( ' srcset="%s 2x"', esc_url( $site_icon_url_2x ) ) : '';
+		$icon_img = sprintf(
+			'<img src="%s"%s width="32" height="32" alt="" class="wp-embed-site-icon" />',
+			esc_url( $site_icon_url ),
+			$srcset
+		);
+	}
+
 	$site_title = sprintf(
-		'<a href="%s" target="_top"><img src="%s" srcset="%s 2x" width="32" height="32" alt="" class="wp-embed-site-icon" /><span>%s</span></a>',
+		'<a href="%s" target="_top">%s<span>%s</span></a>',
 		esc_url( home_url() ),
-		esc_url( get_site_icon_url( 32, includes_url( 'images/w-logo-blue.png' ) ) ),
-		esc_url( get_site_icon_url( 64, includes_url( 'images/w-logo-blue.png' ) ) ),
+		$icon_img,
 		esc_html( get_bloginfo( 'name' ) )
 	);
 
diff --git a/src/wp-includes/general-template.php b/src/wp-includes/general-template.php
index 47e2aeb2ebb05..1ba2912953ae8 100644
--- a/src/wp-includes/general-template.php
+++ b/src/wp-includes/general-template.php
@@ -978,7 +978,10 @@ function get_site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
 		} else {
 			$size_data = array( $size, $size );
 		}
-		$url = wp_get_attachment_image_url( $site_icon_id, $size_data );
+		$attachment_url = wp_get_attachment_image_url( $site_icon_id, $size_data );
+		if ( $attachment_url ) {
+			$url = $attachment_url;
+		}
 	}
 
 	if ( $switched_blog ) {

From 38f40662565c5de0d4ba854a01a614db099ec5b9 Mon Sep 17 00:00:00 2001
From: Sukhendu Sekhar Guria <sukhendu.guria@rtcamp.com>
Date: Mon, 20 Apr 2026 12:54:20 +0530
Subject: [PATCH 2/3] Embeds: Move 2x site icon URL fetch inside if condition

---
 src/wp-includes/embed.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/embed.php b/src/wp-includes/embed.php
index 24e6abf2b4de1..f46377294d38a 100644
--- a/src/wp-includes/embed.php
+++ b/src/wp-includes/embed.php
@@ -1233,13 +1233,13 @@ function print_embed_sharing_dialog() {
  * @since 4.5.0
  */
 function the_embed_site_title() {
-	$site_icon_url    = get_site_icon_url( 32, includes_url( 'images/w-logo-blue.png' ) );
-	$site_icon_url_2x = get_site_icon_url( 64, includes_url( 'images/w-logo-blue.png' ) );
+	$site_icon_url = get_site_icon_url( 32, includes_url( 'images/w-logo-blue.png' ) );
 
 	$icon_img = '';
 	if ( $site_icon_url ) {
-		$srcset   = $site_icon_url_2x ? sprintf( ' srcset="%s 2x"', esc_url( $site_icon_url_2x ) ) : '';
-		$icon_img = sprintf(
+		$site_icon_url_2x = get_site_icon_url( 64, includes_url( 'images/w-logo-blue.png' ) );
+		$srcset           = $site_icon_url_2x ? sprintf( ' srcset="%s 2x"', esc_url( $site_icon_url_2x ) ) : '';
+		$icon_img         = sprintf(
 			'<img src="%s"%s width="32" height="32" alt="" class="wp-embed-site-icon" />',
 			esc_url( $site_icon_url ),
 			$srcset

From 8548ea959edeb14e8e8621fc0fd13ebbb24ee0ec Mon Sep 17 00:00:00 2001
From: Sukhendu Sekhar Guria <sukhendu.guria@rtcamp.com>
Date: Tue, 21 Apr 2026 12:03:19 +0530
Subject: [PATCH 3/3] Embeds: Skip srcset when 1x and 2x site icon URLs are
 identical

---
 src/wp-includes/embed.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wp-includes/embed.php b/src/wp-includes/embed.php
index f46377294d38a..b53c00f67ddc7 100644
--- a/src/wp-includes/embed.php
+++ b/src/wp-includes/embed.php
@@ -1238,7 +1238,7 @@ function the_embed_site_title() {
 	$icon_img = '';
 	if ( $site_icon_url ) {
 		$site_icon_url_2x = get_site_icon_url( 64, includes_url( 'images/w-logo-blue.png' ) );
-		$srcset           = $site_icon_url_2x ? sprintf( ' srcset="%s 2x"', esc_url( $site_icon_url_2x ) ) : '';
+		$srcset           = ( $site_icon_url_2x && $site_icon_url !== $site_icon_url_2x ) ? sprintf( ' srcset="%s 2x"', esc_url( $site_icon_url_2x ) ) : '';
 		$icon_img         = sprintf(
 			'<img src="%s"%s width="32" height="32" alt="" class="wp-embed-site-icon" />',
 			esc_url( $site_icon_url ),