Changeset 16309 for trunk/wp-includes/class-wp-admin-bar.php

Timestamp:

11/11/2010 07:11:12 PM (14 years ago)

Author:

ryan

Message:

Register admin menus against admin_bar_menu action to be consistent with other menu hooks. see #14772

File:

• trunk/wp-includes/class-wp-admin-bar.php (modified) (1 diff)

trunk/wp-includes/class-wp-admin-bar.php

@@ -172 +172 @@
 
     function add_menus() {
-        add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_me_separator', 10 );
-        add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_account_menu', 20 );
-        add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_sites_menu', 30 );
-        add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_edit_menu', 40 );
-        add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_new_content_menu', 50 );
-        add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_comments_menu', 60 );
-        add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_appearance_menu', 70 );
-        add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_updates_menu', 80 );
-        add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_shortlink_menu', 90 );
+        add_action( 'admin_bar_menu', 'wp_admin_bar_me_separator', 10 );
+        add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 20 );
+        add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 30 );
+        add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 40 );
+        add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 50 );
+        add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 60 );
+        add_action( 'admin_bar_menu', 'wp_admin_bar_appearance_menu', 70 );
+        add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 80 );
+        add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 90 );
 
         if ( is_multisite() && is_super_admin() && function_exists('wp_admin_bar_superadmin_settings_menu') )
-            add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_superadmin_settings_menu', 1000 );
+            add_action( 'admin_bar_menu', 'wp_admin_bar_superadmin_settings_menu', 1000 );
 
         do_action('add_admin_bar_menus');