Ticket #3430: 3430.patch

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

@@ -1702 +1702 @@
          * @param BP_User_Query $query BP_User_Query object.
          */
         public function set_orderby( $query ) {
+                global $wpdb;
+
                 $gm_ids = $this->get_group_member_ids();
                 if ( empty( $gm_ids ) ) {
                         $gm_ids = array( 0 );
@@ -1711 +1713 @@
                 // the order according to the query performed in
                 // BP_Group_Member_Query::get_group_members(). Otherwise, fall
                 // through and let BP_User_Query do its own ordering.
-                if ( in_array( $query->query_vars['type'], array( 'last_joined', 'first_joined' ) ) ) {
+                if ( in_array( $query->query_vars['type'], array( 'last_joined', 'first_joined', 'group_activity' ) ) ) {
+
+                        // Group Activity DESC
+                        if ( 'group_activity' == $query->query_vars['type'] ) {
+                                $activity_table = buddypress()->activity->table_name;
+                                $group_activity_where = array( 
+                                        'user_id IN (' . implode( ',', $gm_ids ) . ')',
+                                        'item_id = ' . absint( $query->query_vars['group_id'] ),
+                                        "component = 'groups'",
+                                );
+                                $group_activity_where  = implode( ' AND ', $group_activity_where );
+                                $group_user_ids = $wpdb->get_results( "SELECT user_id, max( date_recorded ) as date_recorded FROM {$activity_table} WHERE {$group_activity_where} GROUP BY user_id ORDER BY date_recorded DESC" );
+                                $gm_ids = wp_list_pluck( $group_user_ids, 'user_id' );
+                        }
 
                         // The first param in the FIELD() clause is the sort column id
                         $gm_ids = array_merge( array( 'u.id' ), wp_parse_id_list( $gm_ids ) );

src/bp-groups/bp-groups-template.php

@@ -2437 +2437 @@
                 <select id="group_members-order-by">
                         <option value="last_joined"><?php _e( 'Newest', 'buddypress' ); ?></option>
                         <option value="first_joined"><?php _e( 'Oldest', 'buddypress' ); ?></option>
+
+                        <?php if ( bp_is_active( 'activity' ) ) : ?>
+                                <option value="group_activity"><?php _e( 'Group Activity', 'buddypress' ); ?></option>
+                        <?php endif; ?>
+
                         <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ); ?></option>
 
                         <?php do_action( 'bp_groups_members_order_options' ); ?>