Ticket #4591: bp-groups-classes.diff

bp-groups-classes.php

@@ -347 +347 @@
                 $total_sql = array();
 
                 $sql['select'] = "SELECT g.*, gm1.meta_value AS total_member_count, gm2.meta_value AS last_activity";
-                $sql['from']   = " FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2,";
+                $sql['from']   = " FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_groupmeta} gm3";
 
                 if ( !empty( $user_id ) )
                         $sql['members_from'] = " {$bp->groups->table_name_members} m,";
@@ -357 +357 @@
                 if ( !empty( $user_id ) )
                         $sql['user_where'] = " g.id = m.group_id AND";
 
-                $sql['where'] = " g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count'";
+                $sql['where'] = " g.id = gm1.group_id AND g.id = gm2.group_id AND g.id = gm3.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count'";
 
                 if ( empty( $show_hidden ) )
                         $sql['hidden'] = " AND g.status != 'hidden'";
 
                 if ( !empty( $search_terms ) ) {
                         $search_terms = like_escape( $wpdb->escape( $search_terms ) );
-                        $sql['search'] = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
+                        $sql['search'] = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' OR gm3.meta_value LIKE '%%{$search_terms}%%' )";
                 }
 
                 if ( !empty( $user_id ) )
@@ -411 +411 @@
                 $paged_groups_sql = apply_filters( 'bp_groups_get_paged_groups_sql', join( ' ', (array) $sql ), $sql );
                 $paged_groups     = $wpdb->get_results( $paged_groups_sql );
 
-                $total_sql['select'] = "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name} g, {$bp->groups->table_name_members} gm1, {$bp->groups->table_name_groupmeta} gm2";
+                $total_sql['select'] = "SELECT COUNT(DISTINCT g.id) FROM {$bp->groups->table_name} g, {$bp->groups->table_name_members} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name_groupmeta} gm3";
 
                 if ( !empty( $user_id ) )
                         $total_sql['select'] .= ", {$bp->groups->table_name_members} m";
@@ -420 +420 @@
                         $total_sql['where'][] = "g.status != 'hidden'";
 
                 if ( !empty( $sql['search'] ) )
-                        $total_sql['where'][] = "( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
+                        $total_sql['where'][] = "( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' OR gm3.meta_value LIKE '%%{$search_terms}%%')";
 
                 if ( !empty( $user_id ) )
                         $total_sql['where'][] = "m.group_id = g.id AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0";
@@ -435 +435 @@
 
                 $total_sql['where'][] = "g.id = gm1.group_id";
                 $total_sql['where'][] = "g.id = gm2.group_id";
+                $total_sql['where'][] = "g.id = gm3.group_id";
                 $total_sql['where'][] = "gm2.meta_key = 'last_activity'";
 
                 $t_sql = $total_sql['select'];