Changeset 6161

Timestamp:

06/30/2012 02:44:30 PM (14 years ago)

Author:

djpaul

Message:

Stop the Toolbar showing when the user is logged in and the BuddyBar is enabled. Fixes #3661 again.

Location:

trunk/bp-core

Files:

• admin/bp-core-settings.php (modified) (1 diff)
• bp-core-buddybar.php (modified) (2 diffs)

trunk/bp-core/admin/bp-core-settings.php

@@ -29 +29 @@
 
         <input id="hide-loggedout-adminbar" name="hide-loggedout-adminbar" type="checkbox" value="1" <?php checked( !bp_hide_loggedout_adminbar( false ) ); ?> />
-        <label for="hide-loggedout-adminbar"><?php _e( 'Show the admin bar for logged out users', 'buddypress' ); ?></label>
+        <label for="hide-loggedout-adminbar"><?php _e( 'Show the Toolbar for logged out users', 'buddypress' ); ?></label>
 
 <?php

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

@@ -632 +632 @@
 
         // Don't show if Toolbar is disabled for non-logged in users
-        if ( (int) bp_get_option( 'hide-loggedout-adminbar' ) )
+        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() ) ) )
@@ -645 +646 @@
         // Hide the WordPress Toolbar
         } elseif ( !bp_use_wp_admin_bar() ) {
-
                 // Keep the WP Toolbar from loading
                 show_admin_bar( false );