Skip to:
Content

BuddyPress.org

Changeset 2484


Ignore:
Timestamp:
01/30/2010 04:53:52 PM (14 years ago)
Author:
apeatling
Message:

Fixes #1712

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-themes/bp-default/_inc/ajax.php

    r2471 r2484  
    166166add_action( 'wp_ajax_delete_activity', 'bp_dtheme_delete_activity' );
    167167
    168 function bp_dtheme_activity_loop( $scope = 'all', $filter = false, $query_string = false, $per_page = 20, $page = 1 ) {
     168function bp_dtheme_activity_loop( $scope = false, $filter = false, $query_string = false, $per_page = 20, $page = 1 ) {
    169169    global $bp;
    170170
     
    174174            $query_string = 'user_id=' . $bp->displayed_user->id;
    175175        } else {
    176             /* Make sure a scope is set. */
    177             if ( empty($scope) )
    178                 $type = 'all';
     176            if ( !empty( $bp->groups->current_group ) )
     177                $scope = 'all';
    179178
    180179            $feed_url = site_url( BP_ACTIVITY_SLUG . '/feed/' );
     
    217216
    218217        /* If we are viewing a group then filter the activity just for this group */
    219         if ( $bp->groups->current_group ) {
     218        if ( !empty( $bp->groups->current_group ) ) {
    220219            $query_string .= '&object=' . $bp->groups->id . '&primary_id=' . $bp->groups->current_group->id;
    221220
Note: See TracChangeset for help on using the changeset viewer.