Changeset 6965

Timestamp:

04/30/2013 01:21:41 AM (12 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:

• bp-core-actions.php (modified) (1 diff)
• bp-core-adminbar.php (modified) (2 diffs)

branches/1.7/bp-core/bp-core-actions.php

@@ -67 +67 @@
 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 );
 

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

@@ -63 +63 @@
  */
 function bp_core_load_admin_bar() {
-    global $wp_version;
+    // Show the Toolbar for logged out users
+    if ( ! is_user_logged_in() && (int) bp_get_option( 'hide-loggedout-adminbar' ) != 1 ) {
+        show_admin_bar( true );
+    }
 
-    // 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_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
@@ -96 +86 @@
     }
 }
+add_action( 'init', 'bp_core_load_admin_bar', 9 );
 
 /**