enmi-conf.org: comparison wp/wp-includes/admin-bar.php

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
 * @subpackage Toolbar
 * @since 3.1.0
 */
 /**
-* Instantiate the admin bar object and set it up as a global for access elsewhere.
+* Instantiates the admin bar object and set it up as a global for access elsewhere.
 *
 * UNHOOKING THIS FUNCTION WILL NOT PROPERLY REMOVE THE ADMIN BAR.
 * For that, use show_admin_bar(false) or the {@see 'show_admin_bar'} filter.
 *
 * @since 3.1.0
 	if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) ) {
 		return;
 	}
 	/**
-	 * Load all necessary admin bar items.
+	 * Loads all necessary admin bar items.
 	 *
 	 * This is the hook used to add, remove, or manipulate admin bar items.
 	 *
 	 * @since 3.1.0
 	 *
-	 * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance, passed by reference
+	 * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance, passed by reference.
 	 */
 	do_action_ref_array( 'admin_bar_menu', array( &$wp_admin_bar ) );
 	/**
 	 * Fires before the admin bar is rendered.
 	$rendered = true;
 }
 /**
-* Add the WordPress logo menu.
+* Adds the WordPress logo menu.
 *
 * @since 3.3.0
 *
-* @param WP_Admin_Bar $wp_admin_bar
+* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
 */
 function wp_admin_bar_wp_menu( $wp_admin_bar ) {
 	if ( current_user_can( 'read' ) ) {
 		$about_url = self_admin_url( 'about.php' );
 	} elseif ( is_multisite() ) {
 		)
 	);
 }
 /**
-* Add the sidebar toggle button.
+* Adds the sidebar toggle button.
 *
 * @since 3.8.0
 *
-* @param WP_Admin_Bar $wp_admin_bar
+* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
 */
 function wp_admin_bar_sidebar_toggle( $wp_admin_bar ) {
 	if ( is_admin() ) {
 		$wp_admin_bar->add_node(
 			array(
 		);
 	}
 }
 /**
-* Add the "My Account" item.
+* Adds the "My Account" item.
 *
 * @since 3.3.0
 *
-* @param WP_Admin_Bar $wp_admin_bar
+* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
 */
 function wp_admin_bar_my_account_item( $wp_admin_bar ) {
 	$user_id      = get_current_user_id();
 	$current_user = wp_get_current_user();
 		)
 	);
 }
 /**
-* Add the "My Account" submenu items.
+* Adds the "My Account" submenu items.
 *
 * @since 3.1.0
 *
-* @param WP_Admin_Bar $wp_admin_bar
+* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
 */
 function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
 	$user_id      = get_current_user_id();
 	$current_user = wp_get_current_user();
 		)
 	);
 }
 /**
-* Add the "Site Name" menu.
+* Adds the "Site Name" menu.
 *
 * @since 3.3.0
 *
-* @param WP_Admin_Bar $wp_admin_bar
+* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
 */
 function wp_admin_bar_site_menu( $wp_admin_bar ) {
 	// Don't show for logged out users.
 	if ( ! is_user_logged_in() ) {
 		return;
 		wp_admin_bar_appearance_menu( $wp_admin_bar );
 	}
 }
 /**
+* Adds the "Edit site" link to the Toolbar.
+*
+* @since 5.9.0
+*
+* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
+*/
+function wp_admin_bar_edit_site_menu( $wp_admin_bar ) {
+	// Don't show if a block theme is not activated.
+	if ( ! wp_is_block_theme() ) {
+		return;
+	}
+	// Don't show for users who can't edit theme options or when in the admin.
+	if ( ! current_user_can( 'edit_theme_options' ) || is_admin() ) {
+		return;
+	}
+	$wp_admin_bar->add_node(
+		array(
+			'id'    => 'site-editor',
+			'title' => __( 'Edit site' ),
+			'href'  => admin_url( 'site-editor.php' ),
+		)
+	);
+}
+/**
 * Adds the "Customize" link to the Toolbar.
 *
 * @since 4.3.0
 *
-* @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance.
+* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
 * @global WP_Customize_Manager $wp_customize
 */
 function wp_admin_bar_customize_menu( $wp_admin_bar ) {
 	global $wp_customize;
+	// Don't show if a block theme is activated and no plugins use the customizer.
+	if ( wp_is_block_theme() && ! has_action( 'customize_register' ) ) {
+		return;
+	}
 	// Don't show for users who can't access the customizer or when in the admin.
 	if ( ! current_user_can( 'customize' ) || is_admin() ) {
 		return;
 	}
 	);
 	add_action( 'wp_before_admin_bar_render', 'wp_customize_support_script' );
 }
 /**
-* Add the "My Sites/[Site Name]" menu and all submenus.
+* Adds the "My Sites/[Site Name]" menu and all submenus.
 *
 * @since 3.1.0
 *
-* @param WP_Admin_Bar $wp_admin_bar
+* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
 */
 function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
 	// Don't show for logged out users or single site mode.
 	if ( ! is_user_logged_in() || ! is_multisite() ) {
 		return;
 				'class' => current_user_can( 'manage_network' ) ? 'ab-sub-secondary' : '',
 			),
 		)
 	);
+	/**
+	 * Filters whether to show the site icons in toolbar.
+	 *
+	 * Returning false to this hook is the recommended way to hide site icons in the toolbar.
+	 * A truthy return may have negative performance impact on large multisites.
+	 *
+	 * @since 6.0.0
+	 *
+	 * @param bool $show_site_icons Whether site icons should be shown in the toolbar. Default true.
+	 */
+	$show_site_icons = apply_filters( 'wp_admin_bar_show_site_icons', true );
 	foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
 		switch_to_blog( $blog->userblog_id );
-		if ( has_site_icon() ) {
+		if ( true === $show_site_icons && has_site_icon() ) {
 			$blavatar = sprintf(
-				'<img class="blavatar" src="%s" srcset="%s 2x" alt="" width="16" height="16" />',
+				'<img class="blavatar" src="%s" srcset="%s 2x" alt="" width="16" height="16"%s />',
 				esc_url( get_site_icon_url( 16 ) ),
-				esc_url( get_site_icon_url( 32 ) )
+				esc_url( get_site_icon_url( 32 ) ),
+				( wp_lazy_loading_enabled( 'img', 'site_icon_in_toolbar' ) ? ' loading="lazy"' : '' )
 			);
 		} else {
 			$blavatar = '<div class="blavatar"></div>';
 		}
 		restore_current_blog();
 	}
 }
 /**
-* Provide a shortlink.
+* Provides a shortlink.
 *
 * @since 3.1.0
 *
-* @param WP_Admin_Bar $wp_admin_bar
+* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
 */
 function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
 	$short = wp_get_shortlink( 0, 'query' );
 	$id    = 'get-shortlink';
 		)
 	);
 }
 /**
-* Provide an edit link for posts and terms.
+* Provides an edit link for posts and terms.
 *
 * @since 3.1.0
 * @since 5.5.0 Added a "View Post" link on Comments screen for a single post.
 *
 * @global WP_Term  $tag
 * @global WP_Query $wp_the_query WordPress Query object.
 * @global int      $user_id      The ID of the user being edited. Not to be confused with the
 *                                global $user_ID, which contains the ID of the current user.
 * @global int      $post_id      The ID of the post when editing comments for a single post.
 *
-* @param WP_Admin_Bar $wp_admin_bar
+* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
 */
 function wp_admin_bar_edit_menu( $wp_admin_bar ) {
 	global $tag, $wp_the_query, $user_id, $post_id;
 	if ( is_admin() ) {
 		}
 	}
 }
 /**
-* Add "Add New" menu.
+* Adds "Add New" menu.
 *
 * @since 3.1.0
 *
-* @param WP_Admin_Bar $wp_admin_bar
+* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
 */
 function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
 	$actions = array();
 	$cpts = (array) get_post_types( array( 'show_in_admin_bar' => true ), 'objects' );
 		);
 	}
 }
 /**
-* Add edit comments link with awaiting moderation count bubble.
+* Adds edit comments link with awaiting moderation count bubble.
 *
 * @since 3.1.0
 *
-* @param WP_Admin_Bar $wp_admin_bar
+* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
 */
 function wp_admin_bar_comments_menu( $wp_admin_bar ) {
 	if ( ! current_user_can( 'edit_posts' ) ) {
 		return;
 	}
 		)
 	);
 }
 /**
-* Add appearance submenu items to the "Site Name" menu.
+* Adds appearance submenu items to the "Site Name" menu.
 *
 * @since 3.1.0
 *
-* @param WP_Admin_Bar $wp_admin_bar
+* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
 */
 function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
 	$wp_admin_bar->add_group(
 		array(
 			'parent' => 'site-name',
 	}
 }
 /**
-* Provide an update link if theme/plugin/core updates are available.
+* Provides an update link if theme/plugin/core updates are available.
 *
 * @since 3.1.0
 *
-* @param WP_Admin_Bar $wp_admin_bar
+* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
 */
 function wp_admin_bar_updates_menu( $wp_admin_bar ) {
 	$update_data = wp_get_update_data();
 		)
 	);
 }
 /**
-* Add search form.
+* Adds search form.
 *
 * @since 3.3.0
 *
-* @param WP_Admin_Bar $wp_admin_bar
+* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
 */
 function wp_admin_bar_search_menu( $wp_admin_bar ) {
 	if ( is_admin() ) {
 		return;
 	}
 		)
 	);
 }
 /**
-* Add a link to exit recovery mode when Recovery Mode is active.
+* Adds a link to exit recovery mode when Recovery Mode is active.
 *
 * @since 5.2.0
 *
-* @param WP_Admin_Bar $wp_admin_bar
+* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
 */
 function wp_admin_bar_recovery_mode_menu( $wp_admin_bar ) {
 	if ( ! wp_is_recovery_mode() ) {
 		return;
 	}
 		)
 	);
 }
 /**
-* Add secondary menus.
+* Adds secondary menus.
 *
 * @since 3.3.0
 *
-* @param WP_Admin_Bar $wp_admin_bar
+* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
 */
 function wp_admin_bar_add_secondary_groups( $wp_admin_bar ) {
 	$wp_admin_bar->add_group(
 		array(
 			'id'   => 'top-secondary',
 		)
 	);
 }
 /**
-* Style and scripts for the admin bar.
+* Prints style and scripts for the admin bar.
 *
 * @since 3.1.0
 */
 function wp_admin_bar_header() {
 	$type_attr = current_theme_supports( 'html5', 'style' ) ? '' : ' type="text/css"';
 <style<?php echo $type_attr; ?> media="print">#wpadminbar { display:none; }</style>
 	<?php
 }
 /**
-* Default admin bar callback.
+* Prints default admin bar callback.
 *
 * @since 3.1.0
 */
 function _admin_bar_bump_cb() {
 	$type_attr = current_theme_supports( 'html5', 'style' ) ? '' : ' type="text/css"';
 	?>
 <style<?php echo $type_attr; ?> media="screen">
 	html { margin-top: 32px !important; }
-	* html body { margin-top: 32px !important; }
 	@media screen and ( max-width: 782px ) {
 		html { margin-top: 46px !important; }
-		* html body { margin-top: 46px !important; }
 	}
 </style>
 	<?php
 }
 * Conditional Tags} article in the Theme Developer Handbook.
 *
 * @since 3.1.0
 *
 * @global bool   $show_admin_bar
-* @global string $pagenow
+* @global string $pagenow        The filename of the current screen.
 *
 * @return bool Whether the admin bar should be showing.
 */
 function is_admin_bar_showing() {
 	global $show_admin_bar, $pagenow;
 	return $show_admin_bar;
 }
 /**
-* Retrieve the admin bar display preference of a user.
+* Retrieves the admin bar display preference of a user.
 *
 * @since 3.1.0
 * @access private
 *
 * @param string $context Context of this preference check. Defaults to 'front'. The 'admin'

changeset 19	3d72ae0968f4
parent 18	be944660c56a
child 21	48c4eec2b7e6