Skip to:
Content

BuddyPress.org

Changeset 5287


Ignore:
Timestamp:
11/05/2011 10:31:17 PM (13 years ago)
Author:
johnjamesjacoby
Message:

Ensure activity stream admin filter shows the currently selected filter on page refresh.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-activity/bp-activity-admin.php

    r5280 r5287  
    389389        if ( 'bottom' == $which )
    390390            return;
    391     ?>
     391
     392        $selected = !empty( $_REQUEST['activity_type'] ) ? $_REQUEST['activity_type'] : '';
     393        ?>
     394
    392395        <div class="alignleft actions">
    393396            <select name="activity_type">
    394                 <option value=""><?php _e( 'Show all activity types', 'buddypress' ); ?></option>
    395                 <option value="activity_update"><?php _e( 'Status Updates', 'buddypress' ); ?></option>
    396                 <option value="activity_comment"><?php _e( 'Status Update Comments', 'buddypress' ); ?></option>
     397                <option value="" <?php selected( !$selected ); ?>><?php _e( 'Show all activity types', 'buddypress' ); ?></option>
     398                <option value="activity_update"  <?php selected( 'activity_update',  $selected ); ?>><?php _e( 'Status Updates', 'buddypress' ); ?></option>
     399                <option value="activity_comment" <?php selected( 'activity_comment', $selected ); ?>><?php _e( 'Status Update Comments', 'buddypress' ); ?></option>
    397400
    398401                <?php if ( bp_is_active( 'blogs' ) ) : ?>
    399                     <option value="new_blog_post"><?php _e( 'Posts', 'buddypress' ); ?></option>
    400                     <option value="new_blog_comment"><?php _e( 'Comments', 'buddypress' ); ?></option>
     402                    <option value="new_blog_post"    <?php selected( 'new_blog_post',    $selected ); ?>><?php _e( 'Posts', 'buddypress' ); ?></option>
     403                    <option value="new_blog_comment" <?php selected( 'new_blog_comment', $selected ); ?>><?php _e( 'Comments', 'buddypress' ); ?></option>
    401404                <?php endif; ?>
    402405
    403406                <?php if ( bp_is_active( 'forums' ) ) : ?>
    404                     <option value="new_forum_topic"><?php _e( 'Forum Topics', 'buddypress' ); ?></option>
    405                     <option value="new_forum_post"><?php _e( 'Forum Replies', 'buddypress' ); ?></option>
     407                    <option value="new_forum_topic" <?php selected( 'new_forum_topic', $selected ); ?>><?php _e( 'Forum Topics', 'buddypress' ); ?></option>
     408                    <option value="new_forum_post"  <?php selected( 'new_forum_post',  $selected ); ?>><?php _e( 'Forum Replies', 'buddypress' ); ?></option>
    406409                <?php endif; ?>
    407410
    408411                <?php if ( bp_is_active( 'groups' ) ) : ?>
    409                     <option value="created_group"><?php _e( 'New Groups', 'buddypress' ); ?></option>
    410                     <option value="joined_group"><?php _e( 'Group Memberships', 'buddypress' ); ?></option>
     412                    <option value="created_group" <?php selected( 'created_group', $selected ); ?>><?php _e( 'New Groups', 'buddypress' ); ?></option>
     413                    <option value="joined_group"  <?php selected( 'joined_group',  $selected ); ?>><?php _e( 'Group Memberships', 'buddypress' ); ?></option>
    411414                <?php endif; ?>
    412415
    413416                <?php if ( bp_is_active( 'friends' ) ) : ?>
    414                     <option value="friendship_accepted"><?php _e( 'Friendships Accepted', 'buddypress' ); ?></option>
    415                     <option value="friendship_created"><?php _e( 'New Friendships', 'buddypress' ); ?></option>
     417                    <option value="friendship_accepted" <?php selected( 'friendship_accepted', $selected ); ?>><?php _e( 'Friendships Accepted', 'buddypress' ); ?></option>
     418                    <option value="friendship_created"  <?php selected( 'friendship_created',  $selected ); ?>><?php _e( 'New Friendships', 'buddypress' ); ?></option>
    416419                <?php endif; ?>
    417420
    418                 <option value="new_member"><?php _e( 'New Members', 'buddypress' ); ?></option>
    419                 <option value="new_avatar"><?php _e( 'New Member Avatar', 'buddypress' ); ?></option>
     421                <option value="new_member" <?php selected( 'new_member', $selected ); ?>><?php _e( 'New Members', 'buddypress' ); ?></option>
     422                <option value="new_avatar" <?php selected( 'new_avatar', $selected ); ?>><?php _e( 'New Member Avatar', 'buddypress' ); ?></option>
    420423
    421424                <?php do_action( 'bp_activity_filter_options' ); ?>
     425
    422426            </select>
    423427
    424428            <?php submit_button( __( 'Filter', 'buddypress' ), 'secondary', false, false, array( 'id' => 'post-query-submit' ) ); ?>
     429
    425430        </div>
    426431    <?php
Note: See TracChangeset for help on using the changeset viewer.