Ticket #16540: 16540.diff

wp-includes/admin-bar.php

@@ -75 +75 @@
  *
  * @since 3.1.0
  */
-function wp_admin_bar_my_account_menu() {
-        global $wp_admin_bar, $user_identity;
+function wp_admin_bar_my_account_menu( &$wp_admin_bar ) {
+        global $user_identity;
 
         $user_id = get_current_user_id();
 
@@ -102 +102 @@
  *
  * @since 3.1.0
  */
-function wp_admin_bar_my_sites_menu() {
-        global $wpdb, $wp_admin_bar;
+function wp_admin_bar_my_sites_menu( &$wp_admin_bar ) {
+        global $wpdb;
 
         /* Add the 'My Sites' menu if the user has more than one site. */
         if ( count( $wp_admin_bar->user->blogs ) <= 1 )
@@ -137 +137 @@
  *
  * @since 3.1.0
  */
-function wp_admin_bar_shortlink_menu() {
-        global $wp_admin_bar;
-
+function wp_admin_bar_shortlink_menu( &$wp_admin_bar ) {
         $short = wp_get_shortlink( 0, 'query' );
         $id = 'get-shortlink';
 
@@ -161 +159 @@
  *
  * @since 3.1.0
  */
-function wp_admin_bar_edit_menu () {
-        global $wp_admin_bar;
-
+function wp_admin_bar_edit_menu( &$wp_admin_bar ) {
         $current_object = get_queried_object();
 
         if ( empty($current_object) )
@@ -181 +177 @@
  *
  * @since 3.1.0
  */
-function wp_admin_bar_new_content_menu() {
-        global $wp_admin_bar;
-
+function wp_admin_bar_new_content_menu( &$wp_admin_bar ) {
         $actions = array();
         foreach ( (array) get_post_types( array( 'show_ui' => true ), 'objects' ) as $ptype_obj ) {
                 if ( true !== $ptype_obj->show_in_menu || ! current_user_can( $ptype_obj->cap->edit_posts ) )
@@ -207 +201 @@
  *
  * @since 3.1.0
  */
-function wp_admin_bar_comments_menu() {
-        global $wp_admin_bar;
-
+function wp_admin_bar_comments_menu( &$wp_admin_bar ) {
         if ( !current_user_can('edit_posts') )
                 return;
 
@@ -225 +217 @@
  *
  * @since 3.1.0
  */
-function wp_admin_bar_appearance_menu() {
-        global $wp_admin_bar;
-
+function wp_admin_bar_appearance_menu( &$wp_admin_bar ) {
         if ( !current_user_can('switch_themes') )
                 return;
 
@@ -248 +238 @@
  *
  * @since 3.1.0
  */
-function wp_admin_bar_updates_menu() {
-        global $wp_admin_bar;
-
+function wp_admin_bar_updates_menu( &$wp_admin_bar ) {
         if ( !current_user_can('install_plugins') )
                 return;