From 23c4fbeaa0458f634eee6e6529bc9aaaa4257ec2 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 20 May 2020 10:36:09 +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]. Props whyisjake, finomeno, ocean90. Fixes #50131. Built from https://develop.svn.wordpress.org/trunk@47832 git-svn-id: http://core.svn.wordpress.org/trunk@47608 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 57de15abd4..673e178b1b 100644 --- a/wp-includes/embed.php +++ b/wp-includes/embed.php @@ -1184,8 +1184,8 @@ function the_embed_site_title() { $site_title = sprintf( '%s', 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 4a92e3ed8a..6522e1ce32 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -1668,7 +1668,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 a54d967be5..6af3c36e77 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-alpha-47821'; +$wp_version = '5.5-alpha-47832'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.