From 6db619b7d67676ab6fcd891fd31822df3c51029e Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Mon, 10 May 2021 18:22:56 +0000
Subject: [PATCH] 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
---
 src/wp-includes/admin-bar.php     | 10 +++++++++-
 src/wp-includes/css/admin-bar.css | 10 +++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/wp-includes/admin-bar.php b/src/wp-includes/admin-bar.php
index 5d6d6fe98c..d36487ee56 100644
--- a/src/wp-includes/admin-bar.php
+++ b/src/wp-includes/admin-bar.php
@@ -582,7 +582,15 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
 	foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
 		switch_to_blog( $blog->userblog_id );
 
-		$blavatar = '<div class="blavatar"></div>';
+		if ( has_site_icon() ) {
+			$blavatar = sprintf(
+				'<img class="blavatar" src="%s" srcset="%s 2x" alt="" width="16" height="16" />',
+				esc_url( get_site_icon_url( 16 ) ),
+				esc_url( get_site_icon_url( 32 ) )
+			);
+		} else {
+			$blavatar = '<div class="blavatar"></div>';
+		}
 
 		$blogname = $blog->blogname;
 
diff --git a/src/wp-includes/css/admin-bar.css b/src/wp-includes/css/admin-bar.css
index 3cc47cb0fc..3a77e2991d 100644
--- a/src/wp-includes/css/admin-bar.css
+++ b/src/wp-includes/css/admin-bar.css
@@ -517,14 +517,18 @@ html:lang(he-il) .rtl #wpadminbar * {
 	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;
 }