Changeset 47833

Timestamp:

05/20/2020 10:36:04 AM (5 years ago)

Author:

SergeyBiryukov

Message:

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.

Location:

branches/5.4

Files:

• . (modified) (1 prop)
• src/wp-includes/embed.php (modified) (1 diff)
• src/wp-includes/functions.php (modified) (1 diff)

branches/5.4/src/wp-includes/embed.php

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

branches/5.4/src/wp-includes/functions.php

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