Skip to:
Content

BuddyPress.org

Changeset 2559


Ignore:
Timestamp:
02/03/2010 12:48:39 PM (16 years ago)
Author:
apeatling
Message:

Remove redundant querystring cookie.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-activity/bp-activity-templatetags.php

    r2499 r2559  
    181181        $object = $bp->groups->id;
    182182        $primary_id = $bp->groups->current_group->id;
     183
     184        if ( 'public' != $bp->groups->current_group->status && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
     185            $show_hidden = true;
    183186    }
    184187

  • trunk/bp-themes/bp-default/_inc/ajax.php

    r2552 r2559  
    178178add_action( 'wp_ajax_delete_activity', 'bp_dtheme_delete_activity' );
    179179
    180 function bp_dtheme_activity_loop( $scope = false, $filter = false, $query_string = false, $per_page = 20, $page = 1 ) {
    181     global $bp;
    182 
    183     if ( !$query_string ) {
    184         /* If we are on a profile page we only want to show that users activity */
    185         if ( $bp->displayed_user->id ) {
    186             $query_string = 'user_id=' . $bp->displayed_user->id;
    187         } else {
    188             if ( !empty( $bp->groups->current_group ) )
    189                 $scope = 'all';
    190 
    191             $feed_url = site_url( BP_ACTIVITY_SLUG . '/feed/' );
    192 
    193             switch ( $scope ) {
    194                 case 'friends':
    195                     $friend_ids = implode( ',', friends_get_friend_user_ids( $bp->loggedin_user->id ) );
    196                     $query_string = 'user_id=' . $friend_ids;
    197                     $feed_url = $bp->loggedin_user->domain . BP_ACTIVITY_SLUG . '/friends/feed/';
    198                     break;
    199                 case 'groups':
    200                     $groups = groups_get_user_groups( $bp->loggedin_user->id );
    201                     $group_ids = implode( ',', $groups['groups'] );
    202                     $query_string = 'object=groups&primary_id=' . $group_ids . '&show_hidden=1';
    203                     $feed_url = $bp->loggedin_user->domain . BP_ACTIVITY_SLUG . '/groups/feed/';
    204                     break;
    205                 case 'favorites':
    206                     $favs = bp_activity_get_user_favorites( $bp->loggedin_user->id );
    207 
    208                     if ( empty( $favs ) )
    209                         $favorite_ids = false;
    210 
    211                     $favorite_ids = implode( ',', (array)$favs );
    212                     $query_string = 'include=' . $favorite_ids;
    213                     $feed_url = $bp->loggedin_user->domain  . BP_ACTIVITY_SLUG . '/favorites/feed/';
    214                     break;
    215                 case 'mentions':
    216                     $query_string = 'show_hidden=1&search_terms=@' . bp_core_get_username( $bp->loggedin_user->id, $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login );
    217                     $feed_url = $bp->loggedin_user->domain . BP_ACTIVITY_SLUG . '/mentions/feed/';
    218 
    219                     /* Reset the number of new @ mentions for the user */
    220                     delete_usermeta( $bp->loggedin_user->id, 'bp_new_mention_count' );
    221                     break;
    222             }
    223         }
    224 
    225         /* Build the filter */
    226         if ( $filter && $filter != '-1' )
    227             $query_string .= '&action=' . $filter;
    228 
    229         /* If we are viewing a group then filter the activity just for this group */
    230         if ( !empty( $bp->groups->current_group ) ) {
    231             $query_string .= '&object=' . $bp->groups->id . '&primary_id=' . $bp->groups->current_group->id;
    232 
    233             /* If we're viewing a non-private group and the user is a member, show the hidden activity for the group */
    234             if ( 'public' != $bp->groups->current_group->status && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
    235                 $query_string .= '&show_hidden=1';
    236         }
    237 
    238         /* Add the per_page param */
    239         $query_string .= '&per_page=' . $per_page;
    240 
    241         /* Add the comments param */
    242         if ( $bp->displayed_user->id || 'mentions' == $scope )
    243             $query_string .= '&display_comments=stream';
    244         else
    245             $query_string .= '&display_comments=threaded';
    246     }
     180function bp_dtheme_activity_loop( $scope = false, $filter = false, $per_page = 20, $page = 1 ) {
     181    global $bp;
     182
     183    /* If we are on a profile page we only want to show that users activity */
     184    if ( $bp->displayed_user->id ) {
     185        $query_string = 'user_id=' . $bp->displayed_user->id;
     186    } else {
     187        if ( !empty( $bp->groups->current_group ) )
     188            $scope = 'all';
     189
     190        $feed_url = site_url( BP_ACTIVITY_SLUG . '/feed/' );
     191
     192        switch ( $scope ) {
     193            case 'friends':
     194                $friend_ids = implode( ',', friends_get_friend_user_ids( $bp->loggedin_user->id ) );
     195                $query_string = 'user_id=' . $friend_ids;
     196                $feed_url = $bp->loggedin_user->domain . BP_ACTIVITY_SLUG . '/friends/feed/';
     197                break;
     198            case 'groups':
     199                $groups = groups_get_user_groups( $bp->loggedin_user->id );
     200                $group_ids = implode( ',', $groups['groups'] );
     201                $query_string = 'object=groups&primary_id=' . $group_ids . '&show_hidden=1';
     202                $feed_url = $bp->loggedin_user->domain . BP_ACTIVITY_SLUG . '/groups/feed/';
     203                break;
     204            case 'favorites':
     205                $favs = bp_activity_get_user_favorites( $bp->loggedin_user->id );
     206
     207                if ( empty( $favs ) )
     208                    $favorite_ids = false;
     209
     210                $favorite_ids = implode( ',', (array)$favs );
     211                $query_string = 'include=' . $favorite_ids;
     212                $feed_url = $bp->loggedin_user->domain  . BP_ACTIVITY_SLUG . '/favorites/feed/';
     213                break;
     214            case 'mentions':
     215                $query_string = 'show_hidden=1&search_terms=@' . bp_core_get_username( $bp->loggedin_user->id, $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login );
     216                $feed_url = $bp->loggedin_user->domain . BP_ACTIVITY_SLUG . '/mentions/feed/';
     217
     218                /* Reset the number of new @ mentions for the user */
     219                delete_usermeta( $bp->loggedin_user->id, 'bp_new_mention_count' );
     220                break;
     221        }
     222    }
     223
     224    /* Build the filter */
     225    if ( $filter && $filter != '-1' )
     226        $query_string .= '&action=' . $filter;
     227
     228    /* If we are viewing a group then filter the activity just for this group */
     229    if ( !empty( $bp->groups->current_group ) ) {
     230        $query_string .= '&object=' . $bp->groups->id . '&primary_id=' . $bp->groups->current_group->id;
     231
     232        /* If we're viewing a non-private group and the user is a member, show the hidden activity for the group */
     233        if ( 'public' != $bp->groups->current_group->status && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
     234            $query_string .= '&show_hidden=1';
     235    }
     236
     237    /* Add the per_page param */
     238    $query_string .= '&per_page=' . $per_page;
     239
     240    /* Add the comments param */
     241    if ( $bp->displayed_user->id || 'mentions' == $scope )
     242        $query_string .= '&display_comments=stream';
     243    else
     244        $query_string .= '&display_comments=threaded';
    247245
    248246    /* Add the new page param */
    … …  
    273271
    274272function bp_dtheme_ajax_load_older_updates() {
    275     bp_dtheme_activity_loop( false, false, $_POST['query_string'], 20, $_POST['page'] );
     273    bp_dtheme_activity_loop( false, false, 20, $_POST['page'] );
    276274}
    277275add_action( 'wp_ajax_activity_get_older_updates', 'bp_dtheme_ajax_load_older_updates' );

  • trunk/bp-themes/bp-default/_inc/global.js

    r2558 r2559  
    108108        /* Reset the page */
    109109        j.cookie( 'bp-activity-oldestpage', 1, {path: '/'} );
    110         j.cookie( 'bp-activity-querystring', null, {path: '/'} );
    111110
    112111        /* Activity Stream Tabs */
    … …  
    232231                action: 'activity_get_older_updates',
    233232                'cookie': encodeURIComponent(document.cookie),
    234                 'query_string': j.cookie('bp-activity-querystring'),
    235233                'page': oldest_page
    236234            },
    … …  
    238236            {
    239237                j("li.load-more").removeClass('loading');
    240 
    241                 j.cookie( 'bp-activity-querystring', response.query_string, {path: '/'} );
    242238                j.cookie( 'bp-activity-oldestpage', oldest_page, {path: '/'} );
    243 
    244239                j("ul.activity-list").append(response.contents);
    245240
    … …  
    10101005        j.cookie('bp-activity-scope', null, {path: '/'});
    10111006        j.cookie('bp-activity-filter', null, {path: '/'});
    1012         j.cookie('bp-activity-querystring', null, {path: '/'});
     1007        j.cookie('bp-activity-oldestpage', null, {path: '/'});
    10131008
    10141009        var objects = [ 'members', 'groups', 'blogs', 'forums' ];
    … …  
    10271022    /* Reset the page */
    10281023    j.cookie( 'bp-activity-oldestpage', 1, {path: '/'} );
    1029     j.cookie( 'bp-activity-querystring', null, {path: '/'} );
    10301024
    10311025    if ( null != j.cookie('bp-activity-filter') && j('#activity-filter-select').length )
    … …  
    11541148    {
    11551149        j('.widget_bp_activity_widget h2 span.ajax-loader').hide();
    1156         j.cookie( 'bp-activity-querystring', response.query_string, {path: '/'} );
    11571150
    11581151        j('div.activity').fadeOut( 100, function() {
Note: See TracChangeset for help on using the changeset viewer.