Changeset 2119

Timestamp:

11/25/2009 10:26:14 AM (15 years ago)

Author:

apeatling

Message:

Fixes #1284 props MrMaz.

File:

• branches/1.1/bp-groups/bp-groups-classes.php (modified) (3 diffs)

branches/1.1/bp-groups/bp-groups-classes.php

@@ -422 +422 @@
         global $wpdb, $bp;
 
+        // Default sql WHERE conditions are blank. TODO: generic handler function.
+        $where_sql = null;
+        $where_conditions = array();
+
+        // Limit results to public status
         if ( $only_public )
-            $public_sql = $wpdb->prepare( " AND g.status = 'public'" );
+            $where_conditions[] = $wpdb->prepare( "g.status = 'public'" );
 
         if ( !is_site_admin() )
-            $hidden_sql = $wpdb->prepare( " AND g.status != 'hidden'");
+            $where_conditions[] = $wpdb->prepare( "g.status != 'hidden'");
+
+        // Build where sql statement if necessary
+        if ( !empty( $where_conditions ) )
+            $where_sql = 'WHERE ' . join( ' AND ', $where_conditions );
 
         if ( $limit && $page )
@@ -438 +447 @@
             switch ( $sort_by ) {
                 default:
-                    $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g WHERE 1=1 {$public_sql} {$hidden_sql} {$order_sql} {$pag_sql}" );
+                    $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g {$where_sql} {$order_sql} {$pag_sql}" );
                     break;
                 case 'members':
@@ -448 +457 @@
             }
         } else {
-            $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g {$public_sql} {$hidden_sql} {$order_sql} {$pag_sql}" );
+            $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g {$where_sql} {$order_sql} {$pag_sql}" );
         }