Changeset 13621 for trunk/src/bp-members/classes/class-bp-members-component.php

Timestamp:

10/29/2023 01:50:21 AM (3 years ago)

Author:

imath

Message:

Improve 404 management in BP_Members_Component::check_parsed_query()

• Make sure to do a 404 if corresponding Members primary navigation does not exist.
• Take in account Members navigations not generated by a BP Component.

Fixes #8932

File:

• trunk/src/bp-members/classes/class-bp-members-component.php (modified) (2 diffs)

trunk/src/bp-members/classes/class-bp-members-component.php

@@ -998 +998 @@
 
                         $bp = buddypress();
+                        if ( ! bp_is_active( $single_item_component ) && ! $bp->members->nav->get_primary( array( 'slug' => $single_item_component ), false ) ) {
+                                bp_do_404();
+                                return;
+                        }
+
+                        // Navigation is generated by a component.
                         if ( isset( $bp->{$single_item_component} ) ) {
                                 $screen_function = '';
@@ -1019 +1025 @@
 
                                 if ( ! $single_item_action || ! $screen_function || ! is_callable( $screen_function ) ) {
+                                        bp_do_404();
+                                        return;
+                                }
+
+                                // Navigation is not generated by a component.
+                        } else {
+                                $sub_nav = $bp->members->nav->get_secondary(
+                                        array(
+                                                'parent_slug' => $single_item_component,
+                                                'slug'        => $single_item_action,
+                                        ),
+                                        false
+                                );
+
+                                if ( ! $sub_nav ) {
                                         bp_do_404();
                                         return;