Changeset 8579

Timestamp:

07/09/2014 08:35:58 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Updates to bp_use_wp_admin_bar():

• Default to true
• Use BP_USE_WP_ADMIN_BAR constant as true/false.
• Use bp_force_buddybar() rather than accessing the option directly.

See #5390.

File:

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

trunk/src/bp-core/bp-core-functions.php

@@ -316 +316 @@
  * @uses apply_filters() Filter 'bp_use_wp_admin_bar' to alter.
  *
- * @return bool False when WP Toolbar support is disabled, true when enabled.
- *        Default: true.
+ * @return bool Default: true. False when WP Toolbar support is disabled.
  */
 function bp_use_wp_admin_bar() {
+
+    // Default to true (to avoid loading deprecated BuddyBar code)
     $use_admin_bar = true;
 
-    // Has the WP Toolbar constant been explicity set?
-    if ( defined( 'BP_USE_WP_ADMIN_BAR' ) && ! BP_USE_WP_ADMIN_BAR )
+    // Has the WP Toolbar constant been explicity opted into?
+    if ( defined( 'BP_USE_WP_ADMIN_BAR' ) ) {
+        $use_admin_bar = (bool) BP_USE_WP_ADMIN_BAR;
+
+    // ...or is the old BuddyBar being forced back into use?
+    } elseif ( bp_force_buddybar( false ) ) {
         $use_admin_bar = false;
-
-    // Has the admin chosen to use the BuddyBar during an upgrade?
-    elseif ( (bool) bp_get_option( '_bp_force_buddybar', false ) )
-        $use_admin_bar = false;
-
-    return apply_filters( 'bp_use_wp_admin_bar', $use_admin_bar );
+    }
+
+    return (bool) apply_filters( 'bp_use_wp_admin_bar', $use_admin_bar );
 }