Changeset 12837

Timestamp:

01/22/2021 06:38:09 PM (4 years ago)

Author:

imath

Message:

Nouveau: Apply columns preference when Groups loop is filtered by type

Using the customizer you can define your preferences about the number of columns the BP Nouveau Template Pack should use to display Groups into their directory page. This preference needs to also be applied when this directory page is only listing Groups matching a specific type.

Props vapvarun

Fixes #8427 (branch 7.0)

File:

• branches/7.0/src/bp-templates/bp-nouveau/includes/template-tags.php (modified) (2 diffs)

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

@@ -548 +548 @@
 
         // @todo: this function could do with passing args so we can pass simple strings in or array of strings
+        $is_directory = bp_is_directory();
 
         // The $component is faked if it's the single group member loop
-        if ( ! bp_is_directory() && ( bp_is_group() && 'members' === bp_current_action() ) ) {
+        if ( ! $is_directory && ( bp_is_group() && 'members' === bp_current_action() ) ) {
             $component = 'members_group';
-        } elseif ( ! bp_is_directory() && ( bp_is_user() && 'my-friends' === bp_current_action() ) ) {
+        } elseif ( ! $is_directory && ( bp_is_user() && 'my-friends' === bp_current_action() ) ) {
             $component = 'members_friends';
         } else {
             $component = sanitize_key( bp_current_component() );
+        }
+
+        /*
+         * For the groups component, we need to take in account the
+         * Groups directory can list Groups according to a Group Type.
+         */
+        if ( 'groups' === $component ) {
+            $is_directory = bp_is_groups_directory();
         }
 
@@ -585 +594 @@
 
         // Only the available components supports custom layouts.
-        if ( ! empty( $available_components[ $component ] ) && ( bp_is_directory() || bp_is_group() || bp_is_user() ) ) {
+        if ( ! empty( $available_components[ $component ] ) && ( $is_directory || bp_is_group() || bp_is_user() ) ) {
             $customizer_option = sprintf( '%s_layout', $component );
             $layout_prefs      = bp_nouveau_get_temporary_setting(