Ticket #4803: 4803.01.patch

bp-core/bp-core-actions.php

@@ -66 +66 @@
 add_action( 'bp_init', 'bp_setup_globals',           4  );
 add_action( 'bp_init', 'bp_setup_nav',               6  );
 add_action( 'bp_init', 'bp_setup_title',             8  );
-add_action( 'bp_init', 'bp_core_load_admin_bar',     10 );
 add_action( 'bp_init', 'bp_core_load_admin_bar_css', 12 );
 
 /**

bp-core/bp-core-adminbar.php

@@ -62 +62 @@
  * @uses add_action() To hook 'bp_core_admin_bar' to 'admin_footer'
  */
 function bp_core_load_admin_bar() {
-        global $wp_version;
-
-        // Don't show if Toolbar is disabled for non-logged in users
-        if ( (int) bp_get_option( 'hide-loggedout-adminbar' ) && ! is_user_logged_in() )
-                return;
-
-        // Show the WordPress Toolbar
-        if ( bp_use_wp_admin_bar() && $wp_version >= 3.1 ) {
-
-                // Respect user's Toolbar display preferences
-                if ( is_user_logged_in() && ( bp_get_admin_bar_pref( 'front', bp_loggedin_user_id() ) || bp_get_admin_bar_pref( 'admin', bp_loggedin_user_id() ) ) )
-                        return;
-
+        // Show the Toolbar for logged out users
+        if ( ! is_user_logged_in() && (int) bp_get_option( 'hide-loggedout-adminbar' ) != 1 ) {
                 show_admin_bar( true );
+        }
 
-        // Hide the WordPress Toolbar
-        } elseif ( !bp_use_wp_admin_bar() ) {
+        // Hide the WordPress Toolbar and show the BuddyBar
+        if ( ! bp_use_wp_admin_bar() ) {
 
                 // Keep the WP Toolbar from loading
                 show_admin_bar( false );
@@ -95 +85 @@
                 add_action( 'admin_footer', 'bp_core_admin_bar'    );
         }
 }
+add_action( 'init', 'bp_core_load_admin_bar', 9 );
 
 /**
  * Handle the Toolbar CSS