Changeset 5644

Timestamp:

01/21/2012 11:28:54 AM (13 years ago)

Author:

djpaul

Message:

Update groups loop total_group_count to reflect include/exclude arguments. Fixes #3924

File:

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

trunk/bp-groups/bp-groups-classes.php

@@ -344 +344 @@
             $sql['pagination'] = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page), intval( $per_page ) );
 
-        /* Get paginated results */
+        // Get paginated results
         $paged_groups_sql = apply_filters( 'bp_groups_get_paged_groups_sql', join( ' ', (array)$sql ), $sql );
         $paged_groups     = $wpdb->get_results( $paged_groups_sql );
@@ -362 +362 @@
             $total_sql['where'][] = "m.group_id = g.id AND m.user_id = {$user_id} AND m.is_confirmed = 1 AND m.is_banned = 0";
 
-        if ( !empty( $exclude ) ) {
-            $exclude = $wpdb->escape( $exclude );
-            $total_sql['where'][] = " g.id NOT IN ({$exclude})";
-        }
+        // Already escaped in the paginated results block
+        if ( ! empty( $include ) )
+            $total_sql['where'][] = "g.id IN ({$include})";
+
+        // Already escaped in the paginated results block
+        if ( ! empty( $exclude ) )
+            $total_sql['where'][] = "g.id NOT IN ({$exclude})";
 
         $total_sql['where'][] = "g.id = gm1.group_id";