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
This commit is contained in:
Sergey Biryukov 2020-05-20 10:38:08 +00:00
parent fd07f8bf9f
commit 8597b34d6f
3 changed files with 4 additions and 4 deletions

View File

@ -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' ) )
);

View File

@ -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;
}

View File

@ -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.