Changeset 5437
- Timestamp:
- 12/04/2011 05:20:57 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/bp-activity/bp-activity-admin.php
r5435 r5437 951 951 * Markup for the "filter" part of the form (i.e. which activity type to display) 952 952 * 953 * @global object $bp BuddyPress global settings 953 954 * @param string $which 'top' or 'bottom' 954 955 * @since 1.6 955 956 */ 956 957 function extra_tablenav( $which ) { 958 global $bp; 959 957 960 if ( 'bottom' == $which ) 958 961 return; 959 962 963 $actions = array(); 960 964 $selected = !empty( $_REQUEST['activity_type'] ) ? $_REQUEST['activity_type'] : ''; 961 ?> 965 966 // Walk through the registered actions, and build an array of actions/values. 967 foreach ( $bp->activity->actions as $action ) { 968 $action = array_values( (array) $action ); 969 970 for ( $i = 0, $i_count = count( $action ); $i < $i_count; $i++ ) 971 $actions[ $action[$i]['key'] ] = $action[$i]['value']; 972 } 973 974 // This was a mis-named activity type from before BP 1.6 975 unset( $actions['friends_register_activity_action'] ); 976 977 // Sort array by the human-readable value 978 natsort( $actions ); 979 ?> 962 980 963 981 <div class="alignleft actions"> 964 982 <select name="activity_type"> 965 983 <option value="" <?php selected( !$selected ); ?>><?php _e( 'Show all activity types', 'buddypress' ); ?></option> 966 <option value="activity_update" <?php selected( 'activity_update', $selected ); ?>><?php _e( 'Status Updates', 'buddypress' ); ?></option> 967 <option value="activity_comment" <?php selected( 'activity_comment', $selected ); ?>><?php _e( 'Status Update Comments', 'buddypress' ); ?></option> 968 969 <?php if ( bp_is_active( 'blogs' ) ) : ?> 970 <option value="new_blog_post" <?php selected( 'new_blog_post', $selected ); ?>><?php _e( 'Posts', 'buddypress' ); ?></option> 971 <option value="new_blog_comment" <?php selected( 'new_blog_comment', $selected ); ?>><?php _e( 'Comments', 'buddypress' ); ?></option> 972 <?php endif; ?> 973 974 <?php if ( bp_is_active( 'forums' ) ) : ?> 975 <option value="new_forum_topic" <?php selected( 'new_forum_topic', $selected ); ?>><?php _e( 'Forum Topics', 'buddypress' ); ?></option> 976 <option value="new_forum_post" <?php selected( 'new_forum_post', $selected ); ?>><?php _e( 'Forum Replies', 'buddypress' ); ?></option> 977 <?php endif; ?> 978 979 <?php if ( bp_is_active( 'groups' ) ) : ?> 980 <option value="created_group" <?php selected( 'created_group', $selected ); ?>><?php _e( 'New Groups', 'buddypress' ); ?></option> 981 <option value="joined_group" <?php selected( 'joined_group', $selected ); ?>><?php _e( 'Group Memberships', 'buddypress' ); ?></option> 982 <?php endif; ?> 983 984 <?php if ( bp_is_active( 'friends' ) ) : ?> 985 <option value="friendship_accepted" <?php selected( 'friendship_accepted', $selected ); ?>><?php _e( 'Friendships Accepted', 'buddypress' ); ?></option> 986 <option value="friendship_created" <?php selected( 'friendship_created', $selected ); ?>><?php _e( 'New Friendships', 'buddypress' ); ?></option> 987 <?php endif; ?> 988 989 <option value="new_member" <?php selected( 'new_member', $selected ); ?>><?php _e( 'New Members', 'buddypress' ); ?></option> 990 <option value="new_avatar" <?php selected( 'new_avatar', $selected ); ?>><?php _e( 'New Member Avatar', 'buddypress' ); ?></option> 991 992 <?php do_action( 'bp_activity_filter_options' ); ?> 993 984 985 <?php foreach ( $actions as $k => $v ) : ?> 986 <option value="<?php echo esc_attr( $k ); ?>" <?php selected( $k, $selected ); ?>><?php echo esc_html( $v ); ?></option> 987 <?php endforeach; ?> 994 988 </select> 995 989 996 990 <?php submit_button( __( 'Filter', 'buddypress' ), 'secondary', false, false, array( 'id' => 'post-query-submit' ) ); ?> 997 998 991 </div> 992 999 993 <?php 1000 994 } -
trunk/bp-activity/bp-activity-functions.php
r5410 r5437 754 754 * Register the activity stream actions for updates 755 755 * 756 * @since 1.2.0 757 * 758 * @global object $bp BuddyPress global settings 759 * @uses bp_activity_set_action() 760 * @uses do_action() To call the 'updates_register_activity_actions' hook 761 */ 762 function updates_register_activity_actions() { 763 global $bp; 764 765 bp_activity_set_action( $bp->activity->id, 'activity_update', __( 'Posted an update', 'buddypress' ) ); 766 756 * @global object $bp BuddyPress global settings 757 * @since 1.6 758 */ 759 function bp_activity_register_activity_actions() { 760 global $bp; 761 762 bp_activity_set_action( $bp->activity->id, 'activity_update', __( 'Posted a status update', 'buddypress' ) ); 763 bp_activity_set_action( $bp->activity->id, 'activity_comment', __( 'Replied to a status update', 'buddypress' ) ); 764 765 do_action( 'bp_activity_register_activity_actions' ); 766 767 // Backpat. Don't use this. 767 768 do_action( 'updates_register_activity_actions' ); 768 769 } 769 add_action( 'bp_register_activity_actions', ' updates_register_activity_actions' );770 add_action( 'bp_register_activity_actions', 'bp_activity_register_activity_actions' ); 770 771 771 772 /****************************************************************************** -
trunk/bp-core/deprecated/1.6.php
r5366 r5437 74 74 } 75 75 76 /** 77 * Activity functions 78 */ 79 80 /** 81 * @deprecated 1.6 82 * @deprecated No longer used. Renamed to bp_activity_register_activity_actions(). 83 */ 84 function updates_register_activity_actions() { 85 _deprecated_function( __FUNCTION__, '1.6' ); 86 } 76 87 ?> -
trunk/bp-friends/bp-friends-activity.php
r5416 r5437 48 48 return false; 49 49 50 // These two added in BP 1.6 51 bp_activity_set_action( $bp->friends->id, 'friendship_accepted', __( 'Friendships accepted', 'buddypress' ) ); 52 bp_activity_set_action( $bp->friends->id, 'friendship_created', __( 'New friendships', 'buddypress' ) ); 53 54 // < BP 1.6 backpat 50 55 bp_activity_set_action( $bp->friends->id, 'friends_register_activity_action', __( 'New friendship created', 'buddypress' ) ); 51 56 -
trunk/bp-xprofile/bp-xprofile-activity.php
r5302 r5437 16 16 global $bp; 17 17 18 if ( bp_is_active( 'activity' ) )19 return false;20 21 18 // Register the activity stream actions for this component 19 bp_activity_set_action( $bp->profile->id, 'new_avatar', __( 'Member changed profile picture', 'buddypress' ) ); 22 20 bp_activity_set_action( $bp->profile->id, 'new_member', __( 'New member registered', 'buddypress' ) ); 23 bp_activity_set_action( $bp->profile->id, 'updated_profile', __( 'Updated Profile', 21 bp_activity_set_action( $bp->profile->id, 'updated_profile', __( 'Updated Profile', 'buddypress' ) ); 24 22 25 23 do_action( 'xprofile_register_activity_actions' );
Note: See TracChangeset
for help on using the changeset viewer.