Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
02/07/2010 08:05:19 PM (17 years ago)
Author:
apeatling
Message:

Fixing missing cache calls.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-groups/bp-groups-classes.php

    r2582 r2619  
    281281                }
    282282
    283                 foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
    284                 $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
    285                 $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
     283                if ( empty( $user_id ) ) {
     284                        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
     285                        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
     286                        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
     287                }
    286288
    287289                return array( 'groups' => $paged_groups, 'total' => $total_groups );
    … …  
    311313                }
    312314
    313                 foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
    314                 $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
    315                 $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'active' );
     315                if ( empty( $user_id ) ) {
     316                        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
     317                        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
     318                        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
     319                }
    316320
    317321                return array( 'groups' => $paged_groups, 'total' => $total_groups );
    … …  
    342346                }
    343347
    344                 foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
    345                 $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
    346                 $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'popular' );
     348                if ( empty( $user_id ) ) {
     349                        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
     350                        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
     351                        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
     352                }
    347353
    348354                return array( 'groups' => $paged_groups, 'total' => $total_groups );
    … …  
    372378                }
    373379
    374                 foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
    375                 $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
    376                 $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'alphabetical' );
     380                if ( empty( $user_id ) ) {
     381                        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
     382                        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
     383                        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
     384                }
    377385
    378386                return array( 'groups' => $paged_groups, 'total' => $total_groups );
    … …  
    406414                }
    407415
    408                 foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
    409                 $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
    410                 $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'most_forum_topics' );
     416                if ( empty( $user_id ) ) {
     417                        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
     418                        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
     419                        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
     420                }
    411421
    412422                return array( 'groups' => $paged_groups, 'total' => $total_groups );
    … …  
    440450                }
    441451
    442                 foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
    443                 $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
    444                 $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'most_forum_posts' );
     452                if ( empty( $user_id ) ) {
     453                        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
     454                        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
     455                        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
     456                }
    445457
    446458                return array( 'groups' => $paged_groups, 'total' => $total_groups );
    … …  
    509521                $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}"  ) );
    510522
    511                 foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
    512                 $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
    513                 $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'letter' );
     523                if ( empty( $user_id ) ) {
     524                        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
     525                        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
     526                        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
     527                }
    514528
    515529                return array( 'groups' => $paged_groups, 'total' => $total_groups );
    … …  
    539553                }
    540554
    541                 foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
    542                 $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
    543                 $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'random' );
     555                if ( empty( $user_id ) ) {
     556                        foreach ( (array)$paged_groups as $group ) $group_ids[] = $group->id;
     557                        $group_ids = $wpdb->escape( join( ',', (array)$group_ids ) );
     558                        $paged_groups = BP_Groups_Group::get_group_extras( &$paged_groups, $group_ids, 'newest' );
     559                }
    544560
    545561                return array( 'groups' => $paged_groups, 'total' => $total_groups );
Note: See TracChangeset for help on using the changeset viewer.