Changeset 13741 for trunk/src/bp-core/bp-core-adminbar.php

Timestamp:

02/23/2024 03:16:00 AM (10 months ago)

Author:

imath

Message:

Deprecate bp_use_wp_admin_bar() & BP_USE_WP_ADMIN_BAR

This function and constant were useful when BuddyPress was including an alternative toolbar to the WordPress Admin Bar called the "BuddyBar". The BuddyBar was removed in [12893] but we forgot to deprecate bp_use_wp_admin_bar() & BP_USE_WP_ADMIN_BAR. This commit is finally achieving the step we missed almost 3 years ago.

Props espellcaste, emaralive

Fixes #9104
Closes ​https://github.com/buddypress/buddypress/pull/234

File:

• trunk/src/bp-core/bp-core-adminbar.php (modified) (3 diffs)

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

@@ -24 +24 @@
 
     // Bail if this is an ajax request.
-    if ( !bp_use_wp_admin_bar() || defined( 'DOING_AJAX' ) )
+    if ( wp_doing_ajax() ) {
         return;
+    }
 
     // Only add menu for logged in user.
@@ -54 +55 @@
         show_admin_bar( true );
     }
-
-    // Hide the WordPress Toolbar.
-    if ( ! bp_use_wp_admin_bar() ) {
-        // Keep the WP Toolbar from loading.
-        show_admin_bar( false );
-    }
 }
 add_action( 'init', 'bp_core_load_admin_bar', 9 );
@@ -87 +82 @@
 function bp_core_enqueue_admin_bar_css() {
 
-    // Bail if not using WordPress's admin bar or it's not showing on this
-    // page request.
-    if ( ! bp_use_wp_admin_bar() || ! is_admin_bar_showing() ) {
+    // Bail if WordPress's admin bar is not showing on this page request.
+    if ( ! is_admin_bar_showing() ) {
         return;
     }