Changeset 11405 for trunk/src/bp-groups/classes/class-bp-groups-component.php

Timestamp:

01/31/2017 08:31:10 PM (8 years ago)

Author:

r-a-y

Message:

Groups: Fix AJAX pagination when on a group type directory page.

This commit moves group type directory detection from the
'template_redirect' hook to our groups component class to ensure
detection is available for AJAX purposes.

Commit also changes invalid group type directory requests to 404 instead
of redirecting back to the main Groups directory.

Props r-a-y, dcavins.

Fixes #7423.

File:

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

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

@@ -266 +266 @@
         } else {
             $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(),
+            ) );
+
+            // Set 404 if we do not have a valid group type.
+            if ( empty( $matched_types ) ) {
+                bp_do_404();
+                return;
+            }
+
+            // Set our directory type marker.
+            $this->current_directory_type = reset( $matched_types );
         }
 
@@ -298 +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;