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

Timestamp:

09/18/2023 02:20:59 AM (3 years ago)

Author:

imath

Message:

Improve BP_Members_Component::check_parsed_query()

As some sub nav items can be added to an existing component by third party plugin authors, checking for an existing and valid screen function from the component's sub_nav property is not enough. We also need to do the same check using The Member's component secondary navigation object.

Fixes #8996
Closes ​https://github.com/buddypress/buddypress/pull/166

File:

• trunk/src/bp-members/classes/class-bp-members-component.php (modified) (1 diff)

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

@@ -992 +992 @@
 
                         $bp = buddypress();
-                        if ( isset( $bp->{$single_item_component}, $bp->{$single_item_component}->sub_nav ) ) {
-                                $screen_functions = wp_list_pluck( $bp->{$single_item_component}->sub_nav, 'screen_function', 'slug' );
-
-                                if ( ! $single_item_action || ! isset( $screen_functions[ $single_item_action ] ) || ! is_callable( $screen_functions[ $single_item_action ] ) ) {
+                        if ( isset( $bp->{$single_item_component} ) ) {
+                                $screen_function = '';
+
+                                if ( isset( $bp->{$single_item_component}->sub_nav ) ) {
+                                        $screen_functions = wp_list_pluck( $bp->{$single_item_component}->sub_nav, 'screen_function', 'slug' );
+
+                                        if ( isset( $screen_functions[ $single_item_action ] ) ) {
+                                                $screen_function = $screen_functions[ $single_item_action ];
+                                        }
+                                }
+
+                                // Check if this nav item has been added from outside the Component's class.
+                                if ( ! $screen_function ) {
+                                        $sub_nav = $this->nav->get( $single_item_component . '/' . $single_item_action );
+
+                                        if ( isset( $sub_nav->screen_function ) && $sub_nav->screen_function ) {
+                                                $screen_function = $sub_nav->screen_function;
+                                        }
+                                }
+
+                                if ( ! $single_item_action || ! $screen_function || ! is_callable( $screen_function ) ) {
                                         bp_do_404();
                                         return;