Changeset 13138

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

Location:

trunk/src/bp-core

Files:

• admin/bp-core-admin-slugs.php (modified) (3 diffs)
• classes/class-bp-admin.php (modified) (1 diff)

trunk/src/bp-core/admin/bp-core-admin-slugs.php

@@ -180 +180 @@
     $static_pages = bp_core_admin_get_static_pages();
 
-    if ( !empty( $static_pages ) ) : ?>
+    if ( ! empty( $static_pages ) ) : ?>
 
         <h3><?php esc_html_e( 'Registration', 'buddypress' ); ?></h3>
@@ -189 +189 @@
                 <?php esc_html_e( 'These pages will only be reachable by users who are not logged in.', 'buddypress' ); ?>
             </p>
+
+            <table class="form-table">
+                <tbody>
+
+                    <?php foreach ( $static_pages as $name => $label ) : ?>
+
+                        <tr valign="top">
+                            <th scope="row">
+                                <label for="bp_pages[<?php echo esc_attr( $name ) ?>]"><?php echo esc_html( $label ) ?></label>
+                            </th>
+
+                            <td>
+
+                                <?php if ( ! bp_is_root_blog() ) switch_to_blog( bp_get_root_blog_id() ); ?>
+
+                                <?php echo wp_dropdown_pages( array(
+                                    'name'             => 'bp_pages[' . esc_attr( $name ) . ']',
+                                    'echo'             => false,
+                                    'show_option_none' => __( '- None -', 'buddypress' ),
+                                    'selected'         => !empty( $existing_pages[$name] ) ? $existing_pages[$name] : false
+                                ) ) ?>
+
+                                <?php if ( ! bp_is_root_blog() ) restore_current_blog(); ?>
+
+                            </td>
+                        </tr>
+
+                    <?php endforeach; ?>
+
+                    <?php
+
+                    /**
+                     * Fires after the display of default static pages for BuddyPress setup.
+                     *
+                     * @since 1.5.0
+                     */
+                    do_action( 'bp_active_external_pages' ); ?>
+
+                </tbody>
+            </table>
         <?php else : ?>
             <?php if ( is_multisite() ) : ?>
@@ -219 +259 @@
                 </p>
             <?php endif; ?>
-        <?php endif; ?>
-
-        <table class="form-table">
-            <tbody>
-
-                <?php if ( bp_allow_access_to_registration_pages() ) : foreach ( $static_pages as $name => $label ) : ?>
-
-                    <tr valign="top">
-                        <th scope="row">
-                            <label for="bp_pages[<?php echo esc_attr( $name ) ?>]"><?php echo esc_html( $label ) ?></label>
-                        </th>
-
-                        <td>
-
-                            <?php if ( ! bp_is_root_blog() ) switch_to_blog( bp_get_root_blog_id() ); ?>
-
-                            <?php echo wp_dropdown_pages( array(
-                                'name'             => 'bp_pages[' . esc_attr( $name ) . ']',
-                                'echo'             => false,
-                                'show_option_none' => __( '- None -', 'buddypress' ),
-                                'selected'         => !empty( $existing_pages[$name] ) ? $existing_pages[$name] : false
-                            ) ) ?>
-
-                            <?php if ( ! bp_is_root_blog() ) restore_current_blog(); ?>
-
-                        </td>
-                    </tr>
-
-                <?php endforeach; endif; ?>
-
-                <?php
-
-                /**
-                 * Fires after the display of default static pages for BuddyPress setup.
-                 *
-                 * @since 1.5.0
-                 */
-                do_action( 'bp_active_external_pages' ); ?>
-
-            </tbody>
-        </table>
-
-        <?php
+        <?php endif;
     endif;
 }

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();