Index: bp-friends.php =================================================================== --- bp-friends.php (revision 3295) +++ bp-friends.php (working copy) @@ -102,27 +102,32 @@ function friends_screen_notification_settings() { global $current_user; ?> - - - - - - - - - - - - - - - - - - - +
id,'notification_friends_friendship_request') || 'yes' == get_usermeta( $current_user->id,'notification_friends_friendship_request') ) { ?>checked="checked" />id,'notification_friends_friendship_request') == 'no' ) { ?>checked="checked" />
id,'notification_friends_friendship_accepted') || 'yes' == get_usermeta( $current_user->id,'notification_friends_friendship_accepted') ) { ?>checked="checked" />id,'notification_friends_friendship_accepted') ) { ?>checked="checked" />
+ + + + + + + + - + + + + + + + + + + + + + + + +
id, 'notification_friends_friendship_request', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_friends_friendship_request', true ) ) { ?>checked="checked" />id, 'notification_friends_friendship_request', true ) == 'no' ) { ?>checked="checked" />
id, 'notification_friends_friendship_accepted', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_friends_friendship_accepted', true ) ) { ?>checked="checked" />id, 'notification_friends_friendship_accepted', true ) ) { ?>checked="checked" />
false, 'item_id' => false, 'secondary_item_id' => false, - 'recorded_time' => gmdate( "Y-m-d H:i:s" ), + 'recorded_time' => bp_core_current_time(), 'hide_sitewide' => false ); @@ -317,7 +322,7 @@ $friendship->friend_user_id = $friend_userid; $friendship->is_confirmed = 0; $friendship->is_limited = 0; - $friendship->date_created = time(); + $friendship->date_created = bp_core_current_time(); if ( $force_accept ) $friendship->is_confirmed = 1; @@ -371,33 +376,35 @@ if ( !$friendship->is_confirmed && BP_Friends_Friendship::accept( $friendship_id ) ) { friends_update_friend_totals( $friendship->initiator_user_id, $friendship->friend_user_id ); - /* Remove the friend request notice */ + // Remove the friend request notice bp_core_delete_notifications_for_user_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' ); - /* Add a friend accepted notice for the initiating user */ + // Add a friend accepted notice for the initiating user bp_core_add_notification( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_accepted' ); $initiator_link = bp_core_get_userlink( $friendship->initiator_user_id ); $friend_link = bp_core_get_userlink( $friendship->friend_user_id ); - /* Record in activity streams for the initiator */ + // Record in activity streams for the initiator friends_record_activity( array( 'user_id' => $friendship->initiator_user_id, 'type' => 'friendship_created', 'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%1$s and %2$s are now friends', 'buddypress' ), $initiator_link, $friend_link ), &$friendship ), - 'item_id' => $friendship_id + 'item_id' => $friendship_id, + 'secondary_item_id' => $friendship->friend_user-id ) ); - /* Record in activity streams for the friend */ + // Record in activity streams for the friend friends_record_activity( array( 'user_id' => $friendship->friend_user_id, 'type' => 'friendship_created', 'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%1$s and %2$s are now friends', 'buddypress' ), $friend_link, $initiator_link ), &$friendship ), 'item_id' => $friendship_id, + 'secondary_item_id' => $friendship->initiator_user_id, 'hide_sitewide' => true /* We've already got the first entry site wide */ ) ); - /* Send the email notification */ + // Send the email notification require_once( BP_PLUGIN_DIR . '/bp-friends/bp-friends-notifications.php' ); friends_notification_accepted_request( $friendship->id, $friendship->initiator_user_id, $friendship->friend_user_id ); @@ -443,7 +450,7 @@ $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id; if ( !$count = wp_cache_get( 'bp_total_friend_count_' . $user_id, 'bp' ) ) { - $count = get_usermeta( $user_id, 'total_friend_count' ); + $count = get_user_meta( $user_id, 'total_friend_count', true ); if ( empty( $count ) ) $count = 0; wp_cache_set( 'bp_total_friend_count_' . $user_id, $count, 'bp' ); } @@ -546,11 +553,11 @@ function friends_update_friend_totals( $initiator_user_id, $friend_user_id, $status = 'add' ) { if ( 'add' == $status ) { - update_usermeta( $initiator_user_id, 'total_friend_count', (int)get_usermeta( $initiator_user_id, 'total_friend_count' ) + 1 ); - update_usermeta( $friend_user_id, 'total_friend_count', (int)get_usermeta( $friend_user_id, 'total_friend_count' ) + 1 ); + update_user_meta( $initiator_user_id, 'total_friend_count', (int)get_user_meta( $initiator_user_id, 'total_friend_count', true ) + 1 ); + update_user_meta( $friend_user_id, 'total_friend_count', (int)get_user_meta( $friend_user_id, 'total_friend_count', true ) + 1 ); } else { - update_usermeta( $initiator_user_id, 'total_friend_count', (int)get_usermeta( $initiator_user_id, 'total_friend_count' ) - 1 ); - update_usermeta( $friend_user_id, 'total_friend_count', (int)get_usermeta( $friend_user_id, 'total_friend_count' ) - 1 ); + update_user_meta( $initiator_user_id, 'total_friend_count', (int)get_user_meta( $initiator_user_id, 'total_friend_count', true ) - 1 ); + update_user_meta( $friend_user_id, 'total_friend_count', (int)get_user_meta( $friend_user_id, 'total_friend_count', true ) - 1 ); } } @@ -558,7 +565,7 @@ BP_Friends_Friendship::delete_all_for_user($user_id); /* Remove usermeta */ - delete_usermeta( $user_id, 'total_friend_count' ); + delete_user_meta( $user_id, 'total_friend_count' ); /* Remove friendship requests FROM user */ bp_core_delete_notifications_from_user( $user_id, $bp->friends->id, 'friendship_request' ); Index: bp-activity.php =================================================================== --- bp-activity.php (revision 3295) +++ bp-activity.php (working copy) @@ -4,12 +4,12 @@ require ( BP_PLUGIN_DIR . '/bp-activity/bp-activity-filters.php' ); function bp_activity_setup_globals() { - global $bp, $wpdb, $current_blog; + global $bp, $wpdb; if ( !defined( 'BP_ACTIVITY_SLUG' ) ) define ( 'BP_ACTIVITY_SLUG', $bp->pages->activity->slug ); - /* For internal identification */ + // For internal identification $bp->activity->id = 'activity'; $bp->activity->name = $bp->pages->activity->name; $bp->activity->slug = BP_ACTIVITY_SLUG; @@ -18,7 +18,7 @@ $bp->activity->table_name_meta = $wpdb->base_prefix . 'bp_activity_meta'; $bp->activity->format_notification_function = 'bp_activity_format_notifications'; - /* Register this in the active components array */ + // Register this in the active components array $bp->active_components[$bp->activity->slug] = $bp->activity->id; do_action( 'bp_activity_setup_globals' ); @@ -92,7 +92,7 @@ if ( !bp_is_active( 'friends' ) ) return false; - if ( !is_site_admin() ) + if ( !is_super_admin() ) $bp->is_item_admin = false; do_action( 'bp_activity_screen_friends' ); @@ -105,7 +105,7 @@ if ( !bp_is_active( 'groups' ) ) return false; - if ( !is_site_admin() ) + if ( !is_super_admin() ) $bp->is_item_admin = false; do_action( 'bp_activity_screen_groups' ); @@ -115,7 +115,7 @@ function bp_activity_screen_favorites() { global $bp; - if ( !is_site_admin() ) + if ( !is_super_admin() ) $bp->is_item_admin = false; do_action( 'bp_activity_screen_favorites' ); @@ -125,7 +125,7 @@ function bp_activity_screen_mentions() { global $bp; - if ( !is_site_admin() ) + if ( !is_super_admin() ) $bp->is_item_admin = false; do_action( 'bp_activity_screen_mentions' ); @@ -172,7 +172,7 @@ if ( is_user_logged_in() ) bp_core_redirect( $bp->loggedin_user->domain ); else - bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . clean_url( $bp->root_domain . '/' . $bp->activity->slug . '/p/' . $bp->current_action ) ) ); + bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . esc_url( $bp->root_domain . '/' . $bp->activity->slug . '/p/' . $bp->current_action ) ) ); } bp_core_load_template( apply_filters( 'bp_activity_template_profile_activity_permalink', 'members/single/activity/permalink' ) ); @@ -182,28 +182,32 @@ function bp_activity_screen_notification_settings() { global $bp; ?> - - - - - - - +
+ + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + - + +
loggedin_user->id, $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login ) ) ?>loggedin_user->id, 'notification_activity_new_mention' ) || 'yes' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_mention' ) ) { ?>checked="checked" />loggedin_user->id, 'notification_activity_new_mention' ) ) { ?>checked="checked" />
user_login ) ?>loggedin_user->id, 'notification_activity_new_reply' ) || 'yes' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_reply' ) ) { ?>checked="checked" />loggedin_user->id, 'notification_activity_new_reply' ) ) { ?>checked="checked" />
loggedin_user->id, $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login ) ) ?>loggedin_user->id, 'notification_activity_new_mention', true ) || 'yes' == get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_mention', true ) ) { ?>checked="checked" />loggedin_user->id, 'notification_activity_new_mention', true ) ) { ?>checked="checked" />
user_login ) ?>loggedin_user->id, 'notification_activity_new_reply', true ) || 'yes' == get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_reply', true ) ) { ?>checked="checked" />loggedin_user->id, 'notification_activity_new_reply', true ) ) { ?>checked="checked" />
user_id != $bp->loggedin_user->id ) + if ( !is_super_admin() && $activity->user_id != $bp->loggedin_user->id ) return false; /* Call the action before the delete so plugins can still fetch information about it */ @@ -540,23 +544,23 @@ } function bp_activity_add( $args = '' ) { - global $bp, $wpdb; + global $bp; $defaults = array( - 'id' => false, // Pass an existing activity ID to update an existing entry. + 'id' => false, // Pass an existing activity ID to update an existing entry. - 'action' => '', // The activity action - e.g. "Jon Doe posted an update" - 'content' => '', // Optional: The content of the activity item e.g. "BuddyPress is awesome guys!" + 'action' => '', // The activity action - e.g. "Jon Doe posted an update" + 'content' => '', // Optional: The content of the activity item e.g. "BuddyPress is awesome guys!" - 'component' => false, // The name/ID of the component e.g. groups, profile, mycomponent - 'type' => false, // The activity type e.g. activity_update, profile_updated - 'primary_link' => '', // Optional: The primary URL for this item in RSS feeds (defaults to activity permalink) + 'component' => false, // The name/ID of the component e.g. groups, profile, mycomponent + 'type' => false, // The activity type e.g. activity_update, profile_updated + 'primary_link' => '', // Optional: The primary URL for this item in RSS feeds (defaults to activity permalink) - 'user_id' => $bp->loggedin_user->id, // Optional: The user to record the activity for, can be false if this activity is not for a user. - 'item_id' => false, // Optional: The ID of the specific item being recorded, e.g. a blog_id + 'user_id' => $bp->loggedin_user->id, // Optional: The user to record the activity for, can be false if this activity is not for a user. + 'item_id' => false, // Optional: The ID of the specific item being recorded, e.g. a blog_id 'secondary_item_id' => false, // Optional: A second ID used to further filter e.g. a comment_id - 'recorded_time' => gmdate( "Y-m-d H:i:s" ), // The GMT time that this activity was recorded - 'hide_sitewide' => false // Should this be hidden on the sitewide activity stream? + 'recorded_time' => bp_core_current_time(), // The GMT time that this activity was recorded + 'hide_sitewide' => false // Should this be hidden on the sitewide activity stream? ); $params = wp_parse_args( $args, $defaults ); @@ -627,7 +631,7 @@ ) ); /* Add this update to the "latest update" usermeta so it can be fetched anywhere. */ - update_usermeta( $bp->loggedin_user->id, 'bp_latest_update', array( 'id' => $activity_id, 'content' => wp_filter_kses( $content ) ) ); + update_user_meta( $bp->loggedin_user->id, 'bp_latest_update', array( 'id' => $activity_id, 'content' => wp_filter_kses( $content ) ) ); /* Require the notifications code so email notifications can be set on the 'bp_activity_posted_update' action. */ require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-notifications.php' ); @@ -754,10 +758,10 @@ else $user_id = $args['user_id']; - $latest_update = get_usermeta( $user_id, 'bp_latest_update' ); + $latest_update = get_user_meta( $user_id, 'bp_latest_update', true ); if ( !empty( $latest_update ) ) { if ( in_array( (int)$latest_update['id'], (array)$activity_ids_deleted ) ) - delete_usermeta( $user_id, 'bp_latest_update' ); + delete_user_meta( $user_id, 'bp_latest_update' ); } do_action( 'bp_activity_delete', $args ); @@ -908,14 +912,14 @@ } function bp_activity_get_user_favorites( $user_id ) { - $my_favs = maybe_unserialize( get_usermeta( $user_id, 'bp_favorite_activities' ) ); + $my_favs = maybe_unserialize( get_user_meta( $user_id, 'bp_favorite_activities', true ) ); $existing_favs = bp_activity_get_specific( array( 'activity_ids' => $my_favs ) ); foreach( (array)$existing_favs['activities'] as $fav ) $new_favs[] = $fav->id; $new_favs = array_unique( (array)$new_favs ); - update_usermeta( $user_id, 'bp_favorite_activities', $new_favs ); + update_user_meta( $user_id, 'bp_favorite_activities', $new_favs ); return apply_filters( 'bp_activity_get_user_favorites', $new_favs ); } @@ -927,7 +931,7 @@ $user_id = $bp->loggedin_user->id; /* Update the user's personal favorites */ - $my_favs = maybe_unserialize( get_usermeta( $bp->loggedin_user->id, 'bp_favorite_activities' ) ); + $my_favs = maybe_unserialize( get_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', true ) ); $my_favs[] = $activity_id; /* Update the total number of users who have favorited this activity */ @@ -938,7 +942,7 @@ else $fav_count = 1; - update_usermeta( $bp->loggedin_user->id, 'bp_favorite_activities', $my_favs ); + update_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', $my_favs ); bp_activity_update_meta( $activity_id, 'favorite_count', $fav_count ); do_action( 'bp_activity_add_user_favorite', $activity_id, $user_id ); @@ -953,7 +957,7 @@ $user_id = $bp->loggedin_user->id; /* Remove the fav from the user's favs */ - $my_favs = maybe_unserialize( get_usermeta( $user_id, 'bp_favorite_activities' ) ); + $my_favs = maybe_unserialize( get_user_meta( $user_id, 'bp_favorite_activities', true ) ); $my_favs = array_flip( (array) $my_favs ); unset( $my_favs[$activity_id] ); $my_favs = array_unique( array_flip( $my_favs ) ); @@ -966,7 +970,7 @@ bp_activity_update_meta( $activity_id, 'favorite_count', $fav_count ); } - update_usermeta( $user_id, 'bp_favorite_activities', $my_favs ); + update_user_meta( $user_id, 'bp_favorite_activities', $my_favs ); do_action( 'bp_activity_remove_user_favorite', $activity_id, $user_id ); @@ -1088,8 +1092,8 @@ bp_activity_delete( array( 'user_id' => $user_id ) ); // Remove any usermeta - delete_usermeta( $user_id, 'bp_latest_update' ); - delete_usermeta( $user_id, 'bp_favorite_activities' ); + delete_user_meta( $user_id, 'bp_latest_update' ); + delete_user_meta( $user_id, 'bp_favorite_activities' ); do_action( 'bp_activity_remove_data', $user_id ); } @@ -1097,7 +1101,22 @@ add_action( 'delete_user', 'bp_activity_remove_data' ); add_action( 'make_spam_user', 'bp_activity_remove_data' ); +/** + * updates_register_activity_actions() + * + * Register the activity stream actions for updates + * + * @global array $bp + */ +function updates_register_activity_actions() { + global $bp; + bp_activity_set_action( $bp->activity->id, 'activity_update', __( 'Posted an update', 'buddypress' ) ); + + do_action( 'updates_register_activity_actions' ); +} +add_action( 'bp_register_activity_actions', 'updates_register_activity_actions' ); + /******************************************************************************** * Custom Actions * @@ -1109,7 +1128,7 @@ function bp_register_activity_actions() { do_action( 'bp_register_activity_actions' ); } -add_action( 'plugins_loaded', 'bp_register_activity_actions' ); +add_action( 'bp_loaded', 'bp_register_activity_actions', 8 ); ?> \ No newline at end of file Index: bp-themes/bp-default/groups/single/activity.php =================================================================== --- bp-themes/bp-default/groups/single/activity.php (revision 3295) +++ bp-themes/bp-default/groups/single/activity.php (working copy) @@ -1,6 +1,6 @@