Changeset 13956

Timestamp:

07/09/2024 01:16:26 AM (9 months ago)

Author:

imath

Message:

Avoid the BP Email menu to be grouped with bbPress menu items

In multisite configs & when BuddyPress is network activated, make sure to add an admin menu separator before the BP Email menu in the site admin menu so that it is not grouped with another plugin's admin menu items.

Props johnjamesjacoby

See #9184 (branch 14.0)

File:

• branches/14.0/src/bp-core/admin/bp-core-admin-functions.php (modified) (1 diff)

branches/14.0/src/bp-core/admin/bp-core-admin-functions.php

@@ -985 +985 @@
  *
  * @since 1.7.0
+ * @since 14.0.0 Added 'bp_admin_separator' filter.
+ *
+ * @global array $menu
  */
 function bp_admin_separator() {
 
-    // Bail if BuddyPress is not network activated and viewing network admin.
+    // Default to always adding
+    $add = true;
+
+    // Skip if BuddyPress is not network activated and viewing network admin.
     if ( is_network_admin() && ! bp_is_network_activated() ) {
-        return;
-    }
-
-    // Bail if BuddyPress is network activated and viewing site admin.
+        $add = false;
+    }
+
+    // Skip if BuddyPress is network activated and viewing site admin.
     if ( ! is_network_admin() && bp_is_network_activated() ) {
-        return;
+        $add = false;
     }
 
     // Prevent duplicate separators when no core menu items exist.
     if ( ! bp_current_user_can( 'bp_moderate' ) ) {
+        $add = false;
+    }
+
+    // Bail if there are no components with admin UI's.
+    if ( ! bp_is_active( 'activity' ) && ! bp_is_active( 'groups' ) ) {
+        $add = false;
+    }
+
+    // Force on Site Admin if BuddyPress Core post-types are registered
+    if ( is_blog_admin() && bp_current_user_can( 'bp_moderate' ) ) {
+
+        // See: BP_Core::register_post_types()
+        if ( post_type_exists( bp_get_email_post_type() ) || post_type_exists( 'buddypress' ) ) {
+            $add = true;
+        }
+    }
+
+    /**
+     * Filters whether a top-level admin menu separator is added.
+     *
+     * @since 14.0.0
+     *
+     * @param bool $add Default true. May be false if nothing to separate.
+     */
+    $add = (bool) apply_filters( 'bp_admin_separator', $add );
+
+    // Bail if a separator is not necessary
+    if ( false === $add ) {
         return;
     }
 
-    // Bail if there are no components with admin UI's. Hardcoded for now, until
-    // there's a real API for determining this later.
-    if ( ! bp_is_active( 'activity' ) && ! bp_is_active( 'groups' ) ) {
-        return;
-    }
-
     global $menu;
 
+    // Append a separator to the end of the global menu array
     $menu[] = array( '', 'read', 'separator-buddypress', '', 'wp-menu-separator buddypress' );
 }