Admin bar: show site icon if set

Author: fushar

src/wp-includes/admin-bar.php

@@ -385,15 +385,22 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) {
 	}
 
 	$title = wp_html_excerpt( $blogname, 40, '…' );
+	$meta  = array(
+		'menu_title' => $title,
+	);
+
+	$site_icon_url = get_site_icon_url( 64 );
+	if ( $site_icon_url ) {
+		$title          = '<img class="site-icon" src="' . esc_url( $site_icon_url ) . '" alt="" />' . $title;
+		$meta['class']  = 'has-site-icon';
+	}
 
 	$wp_admin_bar->add_node(
 		array(
 			'id'    => 'site-name',
 			'title' => $title,
 			'href'  => ( is_admin() || ! current_user_can( 'read' ) ) ? home_url( '/' ) : admin_url(),
-			'meta'  => array(
-				'menu_title' => $title,
-			),
+			'meta'  => $meta,
 		)
 	);
 

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

@@ -581,6 +581,19 @@ html:lang(he-il) .rtl #wpadminbar * {
 	content: "\f102" / '';
 }
 
+#wpadminbar #wp-admin-bar-site-name.has-site-icon > .ab-item:before {
+	content: none;
+}
+
+#wpadminbar #wp-admin-bar-site-name > .ab-item .site-icon {
+	width: 20px;
+	height: 20px;
+	margin: 0 6px 0 0;
+	vertical-align: -5px;
+	background: #f0f0f1;
+	border-radius: 4px;
+}
+
 
 
 /**
@@ -902,7 +915,7 @@ html:lang(he-il) .rtl #wpadminbar * {
 
 	#wpadminbar #wp-admin-bar-edit > .ab-item:before,
 	#wpadminbar #wp-admin-bar-my-sites > .ab-item:before,
-	#wpadminbar #wp-admin-bar-site-name > .ab-item:before,
+	#wpadminbar #wp-admin-bar-site-name:not(.has-site-icon) > .ab-item:before,
 	#wpadminbar #wp-admin-bar-site-editor > .ab-item:before,
 	#wpadminbar #wp-admin-bar-customize > .ab-item:before,
 	#wpadminbar #wp-admin-bar-my-account > .ab-item:before,
@@ -917,6 +930,15 @@ html:lang(he-il) .rtl #wpadminbar * {
 		-moz-osx-font-smoothing: grayscale;
 	}
 
+	#wpadminbar #wp-admin-bar-site-name > .ab-item .site-icon {
+		position: absolute;
+		top: 9px;
+		left: 12px;
+		width: 28px;
+		height: 28px;
+		margin: 0;
+	}
+
 	#wpadminbar #wp-admin-bar-appearance {
 		margin-top: 0;
 	}

tests/phpunit/tests/adminbar.php

@@ -131,6 +131,37 @@ public function test_admin_bar_contains_correct_links_for_users_with_role() {
 		$this->assertSame( $profile_url, $node_user_info->href );
 	}
 
+	/**
+	 * @covers ::wp_admin_bar_site_menu
+	 */
+	public function test_admin_bar_site_name_node_has_no_site_icon_when_unset() {
+		wp_set_current_user( self::$editor_id );
+
+		$wp_admin_bar   = $this->get_standard_admin_bar();
+		$node_site_name = $wp_admin_bar->get_node( 'site-name' );
+
+		$this->assertStringNotContainsString( 'site-icon', $node_site_name->title );
+		$this->assertArrayNotHasKey( 'class', $node_site_name->meta );
+	}
+
+	/**
+	 * @covers ::wp_admin_bar_site_menu
+	 * @requires function imagejpeg
+	 */
+	public function test_admin_bar_site_name_node_includes_site_icon_when_set() {
+		wp_set_current_user( self::$editor_id );
+
+		$attachment_id = self::factory()->attachment->create_upload_object( DIR_TESTDATA . '/images/test-image.jpg' );
+		update_option( 'site_icon', $attachment_id );
+
+		$wp_admin_bar   = $this->get_standard_admin_bar();
+		$node_site_name = $wp_admin_bar->get_node( 'site-name' );
+
+		$this->assertStringContainsString( '<img class="site-icon"', $node_site_name->title );
+		$this->assertStringContainsString( esc_url( get_site_icon_url( 64 ) ), $node_site_name->title );
+		$this->assertSame( 'has-site-icon', $node_site_name->meta['class'] );
+	}
+
 	/**
 	 * @ticket 25162
 	 * @group multisite