WordPress.org

Make WordPress Core

Ticket #46657: 46657.5.diff

File 46657.5.diff, 1.3 KB (added by audrasjb, 5 months ago)

patch refreshed against trunk

  • src/wp-includes/admin-bar.php

    diff --git a/src/wp-includes/admin-bar.php b/src/wp-includes/admin-bar.php
    index 5d6d6fe98c..892d7d003f 100644
    a b 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                $icon_url = get_site_icon_url( 16 );
     586                if ( $icon_url ) {
     587                        $blavatar = '<img class="blavatar" src="' . esc_url( $icon_url ) . '" alt="" width="16" height="16" />';
     588                } else {
     589                        $blavatar = '<div class="blavatar"></div>';
     590                }
    586591
    587592                $blogname = $blog->blogname;
    588593
  • src/wp-includes/css/admin-bar.css

    diff --git a/src/wp-includes/css/admin-bar.css b/src/wp-includes/css/admin-bar.css
    index 3cc47cb0fc..3a77e2991d 100644
    a b 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}