Changeset 4155 for trunk/bp-core/bp-core-buddybar.php

Timestamp:

03/24/2011 06:28:47 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Force WordPress admin bar to show when user is not logged in, if BP_USE_WP_ADMIN_BAR constant is set. Also include Root Blog, Log in, and Register links.

File:

• trunk/bp-core/bp-core-buddybar.php (modified) (1 diff)

trunk/bp-core/bp-core-buddybar.php

@@ -464 +464 @@
 }
 
+/**
+ * Handle the Admin Bar/BuddyBar business
+ *
+ * @todo Clean up global constants
+ *
+ * @global num $wp_version
+ */
 function bp_core_load_admin_bar() {
     global $wp_version;
 
+    // Show the WordPress admin bar
     if ( defined( 'BP_USE_WP_ADMIN_BAR' ) && BP_USE_WP_ADMIN_BAR && $wp_version >= 3.1 ) {
-        // TODO: Add BP support to WP admin bar
-        return;
-
+        show_admin_bar( true );
+
+    // Hide the WordPress admin bar
     } elseif ( !defined( 'BP_DISABLE_ADMIN_BAR' ) || !BP_DISABLE_ADMIN_BAR ) {
+
         // Keep the WP admin bar from loading
         show_admin_bar( false );