Ticket #7903: 7903.02.patch

src/bp-core/bp-core-catchuri.php

@@ -311 +311 @@
                                 ) );
 
                                 if ( ! empty( $matched_types ) ) {
-                                        $bp->current_member_type = reset( $matched_types );
+                                        $bp->current_member_type             = reset( $matched_types );
+                                        $bp->members->current_directory_type = $bp->current_member_type;
                                         unset( $bp_uri[ $uri_offset + 1 ] );
                                 }
                         }

src/bp-core/bp-core-template.php

@@ -1908 +1908 @@
         return (bool) apply_filters( 'bp_is_directory', $retval );
 }
 
+/**
+ * Is this a component's type directory page?
+ *
+ * @since 3.2.0
+ *
+ * @return bool True if the current page is a component's type directory, otherwise false.
+ */
+function bp_is_directory_type() {
+        $bp        = buddypress();
+        $retval    = false;
+        $component = bp_current_component();
+
+        if ( bp_is_directory() && bp_is_active( $component ) ) {
+                $retval = ! empty( $bp->{$component}->current_directory_type );
+        }
+
+        /**
+         * Filters whether or not user is on a component's type directory page.
+         *
+         * @since 3.2.0
+         *
+         * @param bool   $retval    Whether or not user is on a component'type directory page.
+         * @param string $component The current component.
+         */
+        return (bool) apply_filters( 'bp_is_directory_type', $retval, $component );
+}
+
 /**
  * Check to see if a component's URL should be in the root, not under a member page.
  *
@@ -3245 +3272 @@
                                 $bp_classes[] = 'my-activity';
                         }
                 } else {
-                        if ( bp_get_current_member_type() ) {
+                        if ( bp_is_directory_type() ) {
                                 $bp_classes[] = 'type';
                         }
                 }

src/bp-templates/bp-nouveau/includes/template-tags.php

@@ -907 +907 @@
                 $nav_item   = $bp_nouveau->current_nav_item;
                 $classes    = array();
 
-                if ( 'directory' === $bp_nouveau->displayed_nav && ! empty( $nav_item->li_class ) ) {
-                        $classes = (array) $nav_item->li_class;
+                if ( 'directory' === $bp_nouveau->displayed_nav ) {
+                        if ( ! empty( $nav_item->li_class ) ) {
+                                $classes = (array) $nav_item->li_class;
+                        }
+
+                        if ( bp_is_directory_type() ) {
+                                $classes[] = 'no-ajax';
+                        }
                 } elseif ( 'groups' === $bp_nouveau->displayed_nav || 'personal' === $bp_nouveau->displayed_nav ) {
                         $classes  = array( 'bp-' . $bp_nouveau->displayed_nav . '-tab' );
                         $selected = bp_current_action();