Changeset 12824

Timestamp:

12/13/2020 04:00:36 PM (3 years ago)

Author:

imath

Message:

BP Types: use regular admin menu links when multiblog mode is on

For multisite configs defining the BP_ENABLE_MULTIBLOG constant to true, Admin menus for BP Types need to use regular admin links instead of network admin ones.

Props shawfactor

See #8411 (Trunk)

Location:

trunk/src

Files:

• bp-groups/bp-groups-admin.php (modified) (2 diffs)
• bp-members/bp-members-admin.php (modified) (1 diff)

trunk/src/bp-groups/bp-groups-admin.php

@@ -66 +66 @@
     }
 
-    if ( bp_is_network_activated() && is_network_admin() ) {
+    if ( bp_is_network_activated() && ! bp_is_multiblog_mode() && is_network_admin() ) {
         // Adds a 'bp-groups' submenu to go to the root blog Group types screen.
         $group_type_admin_url = add_query_arg( 'taxonomy', 'bp_group_type', get_admin_url( bp_get_root_blog_id(), 'edit-tags.php' ) );
@@ -77 +77 @@
         );
     } elseif ( ! is_network_admin() ) {
-        if ( bp_is_network_activated() ) {
+        if ( bp_is_network_activated() && ! bp_is_multiblog_mode() ) {
             // Adds a 'bp-groups' menu to the root blog menu.
             $redirect_hook = add_menu_page(

trunk/src/bp-members/bp-members-admin.php

@@ -24 +24 @@
     }
 
-    if ( bp_is_network_activated() && is_network_admin() ) {
+    if ( bp_is_network_activated() && ! bp_is_multiblog_mode() && is_network_admin() ) {
         // Adds a users.php submenu to go to the root blog Member types screen.
         $member_type_admin_url = add_query_arg( 'taxonomy', bp_get_member_type_tax_name(), get_admin_url( bp_get_root_blog_id(), 'edit-tags.php' ) );