Skip to content

Commit 6db619b

Browse files
committed
Network and Sites: Display site icons in the My Sites menu.
This updates the My Sites dropdown menu on multisite installs to display the site icon for each site. When a site icon is not selected, the default WordPress logo will continue showing. Props rmccue, joemcgill, afercia, audrasjb, desrosj. Fixes 46657. git-svn-id: https://develop.svn.wordpress.org/trunk@50834 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 2b2f309 commit 6db619b

2 files changed

Lines changed: 16 additions & 4 deletions

File tree

src/wp-includes/admin-bar.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,15 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
582582
foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
583583
switch_to_blog( $blog->userblog_id );
584584

585-
$blavatar = '<div class="blavatar"></div>';
585+
if ( has_site_icon() ) {
586+
$blavatar = sprintf(
587+
'<img class="blavatar" src="%s" srcset="%s 2x" alt="" width="16" height="16" />',
588+
esc_url( get_site_icon_url( 16 ) ),
589+
esc_url( get_site_icon_url( 32 ) )
590+
);
591+
} else {
592+
$blavatar = '<div class="blavatar"></div>';
593+
}
586594

587595
$blogname = $blog->blogname;
588596

src/wp-includes/css/admin-bar.css

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -517,14 +517,18 @@ html:lang(he-il) .rtl #wpadminbar * {
517517
color: #72aee6;
518518
}
519519

520-
#wpadminbar .quicklinks li .blavatar:before {
521-
content: "\f120";
520+
#wpadminbar .quicklinks li img.blavatar,
521+
#wpadminbar .quicklinks li div.blavatar:before {
522522
height: 16px;
523523
width: 16px;
524-
display: inline-block;
525524
margin: 0 8px 2px -2px;
526525
}
527526

527+
#wpadminbar .quicklinks li div.blavatar:before {
528+
content: "\f120";
529+
display: inline-block;
530+
}
531+
528532
#wpadminbar #wp-admin-bar-appearance {
529533
margin-top: -12px;
530534
}

0 commit comments

Comments
 (0)