Skip to:
Content

BuddyPress.org

Changeset 6965


Ignore:
Timestamp:
04/30/2013 01:21:41 AM (8 years ago)
Author:
r-a-y
Message:

Fix toolbar not showing for logged out users (1.7-branch).

See #4803.

Location:
branches/1.7/bp-core
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.7/bp-core/bp-core-actions.php

    r6822 r6965  
    6767add_action( 'bp_init', 'bp_setup_nav',               6  );
    6868add_action( 'bp_init', 'bp_setup_title',             8  );
    69 add_action( 'bp_init', 'bp_core_load_admin_bar',     10 );
    7069add_action( 'bp_init', 'bp_core_load_admin_bar_css', 12 );
    7170
  • branches/1.7/bp-core/bp-core-adminbar.php

    r6762 r6965  
    6363 */
    6464function bp_core_load_admin_bar() {
    65     global $wp_version;
     65    // Show the Toolbar for logged out users
     66    if ( ! is_user_logged_in() && (int) bp_get_option( 'hide-loggedout-adminbar' ) != 1 ) {
     67        show_admin_bar( true );
     68    }
    6669
    67     // Don't show if Toolbar is disabled for non-logged in users
    68     if ( (int) bp_get_option( 'hide-loggedout-adminbar' ) && ! is_user_logged_in() )
    69         return;
    70 
    71     // Show the WordPress Toolbar
    72     if ( bp_use_wp_admin_bar() && $wp_version >= 3.1 ) {
    73 
    74         // Respect user's Toolbar display preferences
    75         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() ) ) )
    76             return;
    77 
    78         show_admin_bar( true );
    79 
    80     // Hide the WordPress Toolbar
    81     } elseif ( !bp_use_wp_admin_bar() ) {
     70    // Hide the WordPress Toolbar and show the BuddyBar
     71    if ( ! bp_use_wp_admin_bar() ) {
    8272
    8373        // Keep the WP Toolbar from loading
     
    9686    }
    9787}
     88add_action( 'init', 'bp_core_load_admin_bar', 9 );
    9889
    9990/**
Note: See TracChangeset for help on using the changeset viewer.