From 8597b34d6f5ad6a4ec25b656edb2671230c005d2 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 20 May 2020 10:38:08 +0000
Subject: [PATCH] Customize: Load the default site icon from the `wp-includes`
 directory.

Files inside the `wp-admin` directory may not be publicly available.

Follow-up to [36635], [47018].

Merges [47832] to the 5.4 branch.

Props whyisjake, finomeno, ocean90.
Fixes #50131.
Built from https://develop.svn.wordpress.org/branches/5.4@47833


git-svn-id: http://core.svn.wordpress.org/branches/5.4@47609 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/embed.php     | 4 ++--
 wp-includes/functions.php | 2 +-
 wp-includes/version.php   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wp-includes/embed.php b/wp-includes/embed.php
index 71a2eb5e88..8a8ea95c40 100644
--- a/wp-includes/embed.php
+++ b/wp-includes/embed.php
@@ -1184,8 +1184,8 @@ function the_embed_site_title() {
 	$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>',
 		esc_url( home_url() ),
-		esc_url( get_site_icon_url( 32, admin_url( 'images/w-logo-blue.png' ) ) ),
-		esc_url( get_site_icon_url( 64, admin_url( 'images/w-logo-blue.png' ) ) ),
+		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' ) ) ),
 		esc_html( get_bloginfo( 'name' ) )
 	);
 
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 78f37e9f4f..c30f12f67b 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1667,7 +1667,7 @@ function do_favicon() {
 	 */
 	do_action( 'do_faviconico' );
 
-	wp_redirect( get_site_icon_url( 32, admin_url( 'images/w-logo-blue.png' ) ) );
+	wp_redirect( get_site_icon_url( 32, includes_url( 'images/w-logo-blue.png' ) ) );
 	exit;
 }
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c09f575ab4..2b305150a4 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4.2-alpha-47831';
+$wp_version = '5.4.2-alpha-47833';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.