WordPress.org

Make WordPress Core

Changeset 47455


Ignore:
Timestamp:
03/14/2020 03:59:22 PM (3 weeks ago)
Author:
SergeyBiryukov
Message:

Toolbar: Move the logic for rendering the admin bar on wp_footer to wp_admin_bar_render().

Clarify in the function documentation that it is now called on wp_body_open action first, with wp_footer as a fallback.

Follow-up to [47221].

Fixes #47053.

Location:
trunk/src/wp-includes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/admin-bar.php

    r47198 r47455  
    5656 * Renders the admin bar to the page based on the $wp_admin_bar->menu member var.
    5757 *
    58  * This is called very late on the footer actions so that it will render after
    59  * anything else being added to the footer.
     58 * This is called very early on the {@see 'wp_body_open'} action so that it will render
     59 * before anything else being added to the page body.
     60 *
     61 * For backward compatibility with themes not using the 'wp_body_open' action,
     62 * the function is also called late on {@see 'wp_footer'}.
    6063 *
    6164 * It includes the {@see 'admin_bar_menu'} action which should be used to hook in and
     
    6568 *
    6669 * @since 3.1.0
     70 * @since 5.4.0 Called on 'wp_body_open' action first, with 'wp_footer' as a fallback.
    6771 *
    6872 * @global WP_Admin_Bar $wp_admin_bar
     73 *
     74 * @staticvar bool $rendered
    6975 */
    7076function wp_admin_bar_render() {
    7177    global $wp_admin_bar;
     78    static $rendered = false;
     79
     80    if ( $rendered ) {
     81        return;
     82    }
    7283
    7384    if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) ) {
     
    101112     */
    102113    do_action( 'wp_after_admin_bar_render' );
     114
     115    $rendered = true;
    103116}
    104117
  • trunk/src/wp-includes/default-filters.php

    r47221 r47455  
    539539add_action( 'activate_header', '_wp_admin_bar_init' );
    540540add_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
     541add_action( 'wp_footer', 'wp_admin_bar_render', 1000 ); // Back-compat for themes not using `wp_body_open`.
    541542add_action( 'in_admin_header', 'wp_admin_bar_render', 0 );
    542543
  • trunk/src/wp-includes/general-template.php

    r47406 r47455  
    28942894function wp_footer() {
    28952895    /**
    2896      * Sets up the Admin Bar if the current theme does not use `wp_body_open`.
    2897      *
    2898      * @since 5.4.0
    2899      */
    2900     if ( ! did_action( 'wp_body_open' ) ) {
    2901         add_action( 'wp_footer', 'wp_admin_bar_render', 1000 );
    2902     }
    2903     /**
    29042896     * Prints scripts or data before the closing body tag on the front end.
    29052897     *
Note: See TracChangeset for help on using the changeset viewer.