Changeset 17658

Timestamp:

04/18/2011 10:03:34 PM (13 years ago)

Author:

ryan

Message:

Used passed admin bar object instead of global. Props solarissmoke. fixes #16540

File:

• trunk/wp-includes/admin-bar.php (modified) (8 diffs)

trunk/wp-includes/admin-bar.php

@@ -76 +76 @@
  * @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();
@@ -103 +103 @@
  * @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. */
@@ -138 +138 @@
  * @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';
@@ -162 +160 @@
  * @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();
 
@@ -182 +178 @@
  * @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 ) {
@@ -208 +202 @@
  * @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;
@@ -226 +218 @@
  * @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;
@@ -249 +239 @@
  * @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;