From e6d50be9915ff9f24b6f6753a53c4b5ded4e2c73 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Fri, 30 Oct 2015 04:24:23 +0000 Subject: [PATCH] Multisite: Restore display of the Toolbar on wp-activate.php while logged-in. Just as with wp-signup.php, display of the Toolbar on wp-activate.php was broken in [23512] due to a hook change for the `_wp_admin_bar_init()` callback. wp-signup.php was fixed in [35423] for #34418. See [35423] for more in-depth background and reasoning behind restoring display of the Toolbar on wp-activate.php and wp-signup.php. Fixes #34496. See #34418. Built from https://develop.svn.wordpress.org/trunk@35449 git-svn-id: http://core.svn.wordpress.org/trunk@35413 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/default-filters.php | 1 + wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php index 75a171b4b0..684bea4a37 100644 --- a/wp-includes/default-filters.php +++ b/wp-includes/default-filters.php @@ -431,6 +431,7 @@ add_action( 'init', 'wp_widgets_init', 1 ); add_action( 'template_redirect', '_wp_admin_bar_init', 0 ); add_action( 'admin_init', '_wp_admin_bar_init' ); add_action( 'before_signup_header', '_wp_admin_bar_init' ); +add_action( 'activate_header', '_wp_admin_bar_init' ); add_action( 'wp_footer', 'wp_admin_bar_render', 1000 ); add_action( 'in_admin_header', 'wp_admin_bar_render', 0 ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 6c0b5acfa3..5bc608354a 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-beta2-35448'; +$wp_version = '4.4-beta2-35449'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.