From 84a1922e18874937a44da07653c862ec8a58ead0 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Fri, 8 Nov 2019 13:19:04 +0000
Subject: [PATCH] Toolbar: Un-deprecate the `WP_Admin_Bar::add_menu()` method.

This is only a wrapper for the `add_node()` method, but it's in widespread use both in core until [46642] and in thousands of plugins and themes. Deprecating it would have made sense when #19647 was originally opened but that's no longer the case.

Props whyisjake

Fixes #19647

Built from https://develop.svn.wordpress.org/trunk@46678


git-svn-id: http://core.svn.wordpress.org/trunk@46478 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-admin-bar.php | 2 --
 wp-includes/version.php            | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/wp-includes/class-wp-admin-bar.php b/wp-includes/class-wp-admin-bar.php
index 2a137e746e..ce1464e125 100644
--- a/wp-includes/class-wp-admin-bar.php
+++ b/wp-includes/class-wp-admin-bar.php
@@ -90,7 +90,6 @@ class WP_Admin_Bar {
 	 * @param array $node The attributes that define the node.
 	 */
 	public function add_menu( $node ) {
-		_deprecated_function( __METHOD__, '5.4.0', __CLASS__ . '::add_node()' );
 		$this->add_node( $node );
 	}
 
@@ -103,7 +102,6 @@ class WP_Admin_Bar {
 	 * @param string $id The menu slug to remove.
 	 */
 	public function remove_menu( $id ) {
-		_deprecated_function( __METHOD__, '5.4.0', __CLASS__ . '::remove_node()' );
 		$this->remove_node( $id );
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 45fe219a13..fee35e174e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-alpha-46677';
+$wp_version = '5.4-alpha-46678';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.