Changeset 2619 for trunk/bp-groups/bp-groups-classes.php

Timestamp:

02/07/2010 08:05:19 PM (15 years ago)

Author:

apeatling

Message:

Fixing missing cache calls.

File:

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

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

@@ -281 +281 @@
         }
 
-        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
-        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
-        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
+        if ( empty( $user_id ) ) {
+            foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
+            $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+            $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
+        }
 
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
@@ -311 +313 @@
         }
 
-        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
-        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
-        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'active' );
+        if ( empty( $user_id ) ) {
+            foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
+            $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+            $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
+        }
 
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
@@ -342 +346 @@
         }
 
-        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
-        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
-        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'popular' );
+        if ( empty( $user_id ) ) {
+            foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
+            $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+            $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
+        }
 
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
@@ -372 +378 @@
         }
 
-        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
-        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
-        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'alphabetical' );
+        if ( empty( $user_id ) ) {
+            foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
+            $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+            $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
+        }
 
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
@@ -406 +414 @@
         }
 
-        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
-        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
-        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'most_forum_topics' );
+        if ( empty( $user_id ) ) {
+            foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
+            $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+            $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
+        }
 
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
@@ -440 +450 @@
         }
 
-        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
-        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
-        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'most_forum_posts' );
+        if ( empty( $user_id ) ) {
+            foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
+            $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+            $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
+        }
 
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
@@ -509 +521 @@
         $paged_groups = $wpdb->get_results( $wpdb->prepare( "SELECT g.*, gm1.meta_value as total_member_count, gm2.meta_value as last_activity FROM {$bp->groups->table_name_groupmeta} gm1, {$bp->groups->table_name_groupmeta} gm2, {$bp->groups->table_name} g 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' AND g.name LIKE '$letter%%' {$hidden_sql} {$search_sql} ORDER BY g.name ASC {$pag_sql}"  ) );
 
-        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
-        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
-        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'letter' );
+        if ( empty( $user_id ) ) {
+            foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
+            $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+            $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
+        }
 
         return array( 'groups' => $paged_groups, 'total' => $total_groups );
@@ -539 +553 @@
         }
 
-        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
-        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
-        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'random' );
+        if ( empty( $user_id ) ) {
+            foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
+            $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
+            $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
+        }
 
         return array( 'groups' => $paged_groups, 'total' => $total_groups );