Ticket #46657: 46657.5.diff

src/wp-includes/admin-bar.php

@@ -582 +582 @@
         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 class="blavatar" src="' . esc_url( $icon_url ) . '" alt="" width="16" height="16" />';
+                } else {
+                        $blavatar = '<div class="blavatar"></div>';
+                }
 
                 $blogname = $blog->blogname;
 

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

@@ -517 +517 @@
         color: #72aee6;
 }
 
-#wpadminbar .quicklinks li .blavatar:before {
-        content: "\f120";
+#wpadminbar .quicklinks li img.blavatar,
+#wpadminbar .quicklinks li div.blavatar:before {
         height: 16px;
         width: 16px;
-        display: inline-block;
         margin: 0 8px 2px -2px;
 }
 
+#wpadminbar .quicklinks li div.blavatar:before {
+        content: "\f120";
+        display: inline-block;
+}
+
 #wpadminbar #wp-admin-bar-appearance {
         margin-top: -12px;
 }