Ticket #46657: 46657.3.diff

src/wp-includes/admin-bar.php

@@ -569 +569 @@
         foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
                 switch_to_blog( $blog->userblog_id );
 
-                $blavatar = '<div class="blavatar"></div>';
+                $icon_url = get_site_icon_url( 16 );
+                if ( $icon_url ) {
+                        $blavatar = '<img src="' . esc_url( $icon_url ) . '" class="blavatar" width="16" height="16" />';
+                } else {
+                        $blavatar = '<div class="blavatar"></div>';
+                }
+
+                /**
+                 * Filter the icon for a site in the My Sites dropdown menu.
+                 *
+                 * @param string $blavatar Site icon markup.
+                 * @param stdClass $blog Site being displayed.
+                 */
+                $blavatar = apply_filters( 'admin_bar_my_sites_site_icon', $blavatar, $blog );
 
                 $blogname = $blog->blogname;
 

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

@@ -511 +511 @@
         color: #eee;
 }
 
+#wpadminbar .quicklinks li img.blavatar {
+        height: 16px;
+        width: 16px;
+        display: inline-block;
+        margin: 6px 8px 0 -2px;
+}
+
 #wpadminbar .quicklinks li a:hover .blavatar,
 #wpadminbar .quicklinks li a:focus .blavatar,
 #wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a .blavatar {