Ticket #7423: 7423.01.patch

src/bp-groups/bp-groups-screens.php

@@ -21 +21 @@
  */
 function groups_directory_groups_setup() {
         if ( bp_is_groups_directory() ) {
-                // Set group type if available.
-                if ( bp_is_current_action( bp_get_groups_group_type_base() ) && bp_action_variable() ) {
-                        $matched_types = bp_groups_get_group_types( array(
-                                'has_directory'  => true,
-                                'directory_slug' => bp_action_variable(),
-                        ) );
-
-                        // Redirect back to group directory if no match.
-                        if ( empty( $matched_types ) ) {
-                                bp_core_redirect( bp_get_groups_directory_permalink() );
-                        }
-
-                        // Set our global variable.
-                        buddypress()->groups->current_directory_type = reset( $matched_types );
-                }
-
                 bp_update_is_directory( true, 'groups' );
 
                 /**

src/bp-groups/classes/class-bp-groups-component.php

@@ -267 +267 @@
                         $this->current_group = 0;
                 }
 
+                // Set group type if available.
+                if ( bp_is_groups_directory() && bp_is_current_action( bp_get_groups_group_type_base() ) && bp_action_variable() ) {
+                        $matched_types = bp_groups_get_group_types( array(
+                                'has_directory'  => true,
+                                'directory_slug' => bp_action_variable(),
+                        ) );
+
+                        // Redirect back to group directory if no match.
+                        if ( empty( $matched_types ) ) {
+                                add_action( 'bp_template_redirect', function() {
+                                        bp_core_redirect( bp_get_groups_directory_permalink() );
+                                } );
+                        }
+
+                        // Set our directory type marker.
+                        $this->current_directory_type = reset( $matched_types );
+                }
+
                 // Set up variables specific to the group creation process.
                 if ( bp_is_groups_component() && bp_is_current_action( 'create' ) && bp_user_can_create_groups() && isset( $_COOKIE['bp_new_group_id'] ) ) {
                         $bp->groups->new_group_id = (int) $_COOKIE['bp_new_group_id'];
@@ -297 +315 @@
                 ) );
 
                 // If the user was attempting to access a group, but no group by that name was found, 404.
-                if ( bp_is_groups_component() && empty( $this->current_group ) && bp_current_action() && !in_array( bp_current_action(), $this->forbidden_names ) ) {
+                if ( bp_is_groups_component() && empty( $this->current_group ) && empty( $this->current_directory_type ) && bp_current_action() && ! in_array( bp_current_action(), $this->forbidden_names ) ) {
                         bp_do_404();
                         return;
                 }