Changeset 13138 for trunk/src/bp-core/classes/class-bp-admin.php

Timestamp:

11/06/2021 04:46:47 PM (4 years ago)

Author:

imath

Message:

BP Admin Tabs: improve the Pages settings screen display

This commit also makes sure the BP Admin Tabs are well displayed in Multisite configs when BuddyPress is network activated.

Props oztaser

Fixes #8588

File:

• trunk/src/bp-core/classes/class-bp-admin.php (modified) (1 diff)

trunk/src/bp-core/classes/class-bp-admin.php

@@ -1288 +1288 @@
      */
     public function add_inline_styles() {
-        $screen                  = get_current_screen();
-        $current_settings_tab_id = array_search( $screen->id, $this->submenu_pages['settings'], true );
-        $current_tools_tab_id    = array_search( $screen->id, $this->submenu_pages['tools'], true );
+        $screen = get_current_screen();
+
+        if ( ! isset( $screen->id ) ) {
+            return;
+        }
+
+        // We might need to edit this id, see below code.
+        $screen_id = $screen->id;
+
+        // Multisite configs adds a '-network' suffix to page hooknames inside the Network Admin screens.
+        if ( is_multisite() && is_network_admin() && bp_is_network_activated() ) {
+            $screen_id = str_replace( '-network', '', $screen_id );
+        }
+
+        $current_settings_tab_id = array_search( $screen_id, $this->submenu_pages['settings'], true );
+        $current_tools_tab_id    = array_search( $screen_id, $this->submenu_pages['tools'], true );
         $current_tab_id          = '';
         $tabs                    = array();