Ticket #47053: 47053.7.diff

src/wp-includes/admin-bar.php

@@ -55 +55 @@
 /**
  * Renders the admin bar to the page based on the $wp_admin_bar->menu member var.
  *
- * This is called very late on the footer actions so that it will render after
- * anything else being added to the footer.
+ * This is called very early on the {@see 'wp_body_open'} action so that it will render
+ * before anything else being added to the page body.
  *
+ * For backward compatibility with themes not using the 'wp_body_open' action,
+ * the function is also called late on {@see 'wp_footer'}.
+ *
  * It includes the {@see 'admin_bar_menu'} action which should be used to hook in and
  * add new menus to the admin bar. That way you can be sure that you are adding at most
  * optimal point, right before the admin bar is rendered. This also gives you access to
@@ -64 +67 @@
  * the `$post` global, among others.
  *
  * @since 3.1.0
+ * @since 5.4.0 Called on 'wp_body_open' action first, with 'wp_footer' as a fallback.
  *
  * @global WP_Admin_Bar $wp_admin_bar
+ *
+ * @staticvar bool $rendered
  */
 function wp_admin_bar_render() {
         global $wp_admin_bar;
+        static $rendered = false;
 
+        if ( $rendered ) {
+                return;
+        }
+
         if ( ! is_admin_bar_showing() || ! is_object( $wp_admin_bar ) ) {
                 return;
         }
@@ -100 +111 @@
          * @since 3.1.0
          */
         do_action( 'wp_after_admin_bar_render' );
+
+        $rendered = true;
 }
 
 /**

src/wp-includes/default-filters.php

@@ -538 +538 @@
 add_action( 'before_signup_header', '_wp_admin_bar_init' );
 add_action( 'activate_header', '_wp_admin_bar_init' );
 add_action( 'wp_body_open', 'wp_admin_bar_render', 0 );
+add_action( 'wp_footer', 'wp_admin_bar_render', 1000 ); // Back-compat for themes not using `wp_body_open`.
 add_action( 'in_admin_header', 'wp_admin_bar_render', 0 );
 
 // Former admin filters that can also be hooked on the front end.

src/wp-includes/general-template.php

@@ -2893 +2893 @@
  */
 function wp_footer() {
         /**
-         * Sets up the Admin Bar if the current theme does not use `wp_body_open`.
-         *
-         * @since 5.4.0
-         */
-        if ( ! did_action( 'wp_body_open' ) ) {
-                add_action( 'wp_footer', 'wp_admin_bar_render', 1000 );
-        }
-        /**
          * Prints scripts or data before the closing body tag on the front end.
          *
          * @since 1.5.1