Ticket #47053: 47053.6.diff

src/wp-includes/admin-bar.php

@@ -74 +74 @@
                 return;
         }
 
+        // Return early if the admin bar was already rendered on `wp_body_open`.
+        if ( did_action( 'wp_body_open' ) && 'wp_body_open' !== current_action() ) {
+                return;
+        }
+
         /**
          * Load all necessary admin bar items.
          *

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