Changeset 5678 for branches/1.5/bp-core/bp-core-adminbar.php

Timestamp:

02/07/2012 02:16:37 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Fix toolbar if running 1.5 branch on WordPress 3.3/3.4. See #3983 (1.5 branch)

File:

• branches/1.5/bp-core/bp-core-adminbar.php (modified) (4 diffs)

branches/1.5/bp-core/bp-core-adminbar.php

@@ -66 +66 @@
  * Add a menu for the root site of this BuddyPress network
  *
- * @global type $bp
  * @global type $wp_admin_bar
  * @return If in ajax
  */
 function bp_admin_bar_root_site() {
-    global $bp, $wp_admin_bar;
+    global $wp_admin_bar;
 
     // Create the root blog menu
@@ -113 +112 @@
  */
 function bp_admin_bar_my_sites_menu() {
-    global $wpdb, $wp_admin_bar;
+    global $wp_admin_bar;
 
     /* Add the 'My Sites' menu if the user has more than one site. */
@@ -217 +216 @@
 
     $update_title = array( );
-    if ( $wordpress_update_count )
+    if ( !empty( $wordpress_update_count ) )
         $update_title[] = sprintf( __( '%d WordPress Update' ), $wordpress_update_count );
     if ( $plugin_update_count )
@@ -237 +236 @@
  */
 function bp_core_load_admin_bar_css() {
-    global $wp_version;
 
     if ( !bp_use_wp_admin_bar() )