Index: bp-activity/bp-activity-classes.php =================================================================== --- bp-activity/bp-activity-classes.php (revision 4556) +++ bp-activity/bp-activity-classes.php (working copy) @@ -523,7 +523,7 @@ Class BP_Activity_Activity { } function total_favorite_count( $user_id ) { - if ( !$favorite_activity_entries = get_user_meta( $user_id, bp_get_user_meta_key( 'bp_favorite_activities' ), true ) ) + if ( !$favorite_activity_entries = bp_get_user_meta( $user_id, 'bp_favorite_activities', true ) ) return 0; return count( maybe_unserialize( $favorite_activity_entries ) ); Index: bp-activity/bp-activity-functions.php =================================================================== --- bp-activity/bp-activity-functions.php (revision 4556) +++ bp-activity/bp-activity-functions.php (working copy) @@ -38,8 +38,8 @@ function bp_activity_find_mentions( $content ) { * @param int $user_id The id of the user whose unread mentions are being reset */ function bp_activity_clear_new_mentions( $user_id ) { - delete_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mention_count' ) ); - delete_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mentions' ) ); + bp_delete_user_meta( $user_id, 'bp_new_mention_count' ); + bp_delete_user_meta( $user_id, 'bp_new_mentions' ); } /** @@ -64,8 +64,8 @@ function bp_activity_adjust_mention_count( $activity_id, $action = 'add' ) { continue; // Adjust the mention list and count for the member - $new_mention_count = (int)get_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mention_count' ), true ); - if ( !$new_mentions = get_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mentions' ), true ) ) + $new_mention_count = (int)bp_get_user_meta( $user_id, 'bp_new_mention_count', true ); + if ( !$new_mentions = bp_get_user_meta( $user_id, 'bp_new_mentions', true ) ) $new_mentions = array(); switch ( $action ) { @@ -88,8 +88,8 @@ function bp_activity_adjust_mention_count( $activity_id, $action = 'add' ) { $new_mention_count = count( $new_mentions ); // Resave the user_meta - update_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mention_count' ), $new_mention_count ); - update_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mentions' ), $new_mentions ); + bp_update_user_meta( $user_id, 'bp_new_mention_count', $new_mention_count ); + bp_update_user_meta( $user_id, 'bp_new_mentions', $new_mentions ); } } } @@ -190,7 +190,7 @@ function bp_activity_get_user_favorites( $user_id = 0 ) { $user_id = $bp->displayed_user->id; // Get favorites for user - $favs = get_user_meta( $user_id, bp_get_user_meta_key( 'bp_favorite_activities' ), true ); + $favs = bp_get_user_meta( $user_id, 'bp_favorite_activities', true ); return apply_filters( 'bp_activity_get_user_favorites', $favs ); } @@ -215,7 +215,7 @@ function bp_activity_add_user_favorite( $activity_id, $user_id = 0 ) { $user_id = $bp->loggedin_user->id; // Update the user's personal favorites - $my_favs = get_user_meta( $bp->loggedin_user->id, bp_get_user_meta_key( 'bp_favorite_activities' ), true ); + $my_favs = bp_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 @@ -223,7 +223,7 @@ function bp_activity_add_user_favorite( $activity_id, $user_id = 0 ) { $fav_count = !empty( $fav_count ) ? (int)$fav_count + 1 : 1; // Update user meta - update_user_meta( $bp->loggedin_user->id, bp_get_user_meta_key( 'bp_favorite_activities' ), $my_favs ); + bp_update_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', $my_favs ); // Update activity meta counts if ( true === bp_activity_update_meta( $activity_id, 'favorite_count', $fav_count ) ) { @@ -255,7 +255,7 @@ function bp_activity_remove_user_favorite( $activity_id, $user_id = 0 ) { $user_id = $bp->loggedin_user->id; // Remove the fav from the user's favs - $my_favs = get_user_meta( $user_id, bp_get_user_meta_key( 'bp_favorite_activities' ), true ); + $my_favs = bp_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 ) ); @@ -267,7 +267,7 @@ function bp_activity_remove_user_favorite( $activity_id, $user_id = 0 ) { if ( bp_activity_update_meta( $activity_id, 'favorite_count', (int)$fav_count - 1 ) ) { // Update users favorites - if ( update_user_meta( $user_id, bp_get_user_meta_key( 'bp_favorite_activities' ), $my_favs ) ) { + if ( bp_update_user_meta( $user_id, 'bp_favorite_activities', $my_favs ) ) { // Execute additional code do_action( 'bp_activity_remove_user_favorite', $activity_id, $user_id ); @@ -499,8 +499,8 @@ function bp_activity_remove_all_user_data( $user_id = 0 ) { bp_activity_delete( array( 'user_id' => $user_id ) ); // Remove any usermeta - delete_user_meta( $user_id, bp_get_user_meta_key( 'bp_latest_update' ) ); - delete_user_meta( $user_id, bp_get_user_meta_key( 'bp_favorite_activities' ) ); + bp_delete_user_meta( $user_id, 'bp_latest_update' ); + bp_delete_user_meta( $user_id, 'bp_favorite_activities' ); // Execute additional code do_action( 'bp_activity_remove_data', $user_id ); // Deprecated! Do not use! @@ -675,7 +675,7 @@ function bp_activity_post_update( $args = '' ) { ) ); // Add this update to the "latest update" usermeta so it can be fetched anywhere. - update_user_meta( $bp->loggedin_user->id, bp_get_user_meta_key( 'bp_latest_update' ), array( 'id' => $activity_id, 'content' => wp_filter_kses( $content ) ) ); + bp_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' ); @@ -807,10 +807,10 @@ function bp_activity_delete( $args = '' ) { do_action( 'bp_before_activity_delete', $args ); - $latest_update = get_user_meta( $user_id, bp_get_user_meta_key( 'bp_latest_update' ), true ); + $latest_update = bp_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_user_meta( $user_id, bp_get_user_meta_key( 'bp_latest_update' ) ); + bp_delete_user_meta( $user_id, 'bp_latest_update' ); } do_action( 'bp_activity_delete', $args ); Index: bp-activity/bp-activity-notifications.php =================================================================== --- bp-activity/bp-activity-notifications.php (revision 4556) +++ bp-activity/bp-activity-notifications.php (working copy) @@ -34,7 +34,7 @@ function bp_activity_at_message_notification( $content, $poster_user_id, $activi $message = ''; // Now email the user with the contents of the message (if they have enabled email notifications) - if ( 'no' != get_user_meta( $receiver_user_id, bp_get_user_meta_key( 'notification_activity_new_mention' ), true ) ) { + if ( 'no' != bp_get_user_meta( $receiver_user_id, 'notification_activity_new_mention', true ) ) { $poster_name = bp_core_get_user_displayname( $poster_user_id ); $message_link = bp_activity_get_permalink( $activity_id ); @@ -81,7 +81,7 @@ function bp_activity_new_comment_notification( $comment_id, $commenter_id, $para $original_activity = new BP_Activity_Activity( $activity_id ); - if ( $original_activity->user_id != $commenter_id && 'no' != get_user_meta( $original_activity->user_id, bp_get_user_meta_key( 'notification_activity_new_reply' ), true ) ) { + if ( $original_activity->user_id != $commenter_id && 'no' != bp_get_user_meta( $original_activity->user_id, 'notification_activity_new_reply', true ) ) { $poster_name = bp_core_get_user_displayname( $commenter_id ); $thread_link = bp_activity_get_permalink( $activity_id ); $settings_link = bp_core_get_user_domain( $original_activity->user_id ) . BP_SETTINGS_SLUG . '/notifications/'; @@ -126,7 +126,7 @@ To view your original update and all comments, log in and visit: %3$s $parent_comment = new BP_Activity_Activity( $parent_id ); - if ( $parent_comment->user_id != $commenter_id && $original_activity->user_id != $parent_comment->user_id && 'no' != get_user_meta( $parent_comment->user_id, bp_get_user_meta_key( 'notification_activity_new_reply' ), true ) ) { + if ( $parent_comment->user_id != $commenter_id && $original_activity->user_id != $parent_comment->user_id && 'no' != bp_get_user_meta( $parent_comment->user_id, 'notification_activity_new_reply', true ) ) { $poster_name = bp_core_get_user_displayname( $commenter_id ); $thread_link = bp_activity_get_permalink( $activity_id ); $settings_link = bp_core_get_user_domain( $parent_comment->user_id ) . BP_SETTINGS_SLUG . '/notifications/'; Index: bp-activity/bp-activity-screens.php =================================================================== --- bp-activity/bp-activity-screens.php (revision 4556) +++ bp-activity/bp-activity-screens.php (working copy) @@ -156,10 +156,10 @@ add_action( 'bp_screens', 'bp_activity_screen_single_activity_permalink' ); function bp_activity_screen_notification_settings() { global $bp; - if ( !$mention = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_activity_new_mention' ), true ) ) + if ( !$mention = bp_get_user_meta( $bp->displayed_user->id, 'notification_activity_new_mention', true ) ) $mention = 'yes'; - if ( !$reply = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_activity_new_reply' ), true ) ) + if ( !$reply = bp_get_user_meta( $bp->displayed_user->id, 'notification_activity_new_reply', true ) ) $reply = 'yes'; ?> Index: bp-activity/bp-activity-template.php =================================================================== --- bp-activity/bp-activity-template.php (revision 4556) +++ bp-activity/bp-activity-template.php (working copy) @@ -93,7 +93,7 @@ class BP_Activity_Template { $this->disable_blogforum_replies = isset( $bp->site_options['bp-disable-blogforum-comments'] ) ? $bp->site_options['bp-disable-blogforum-comments'] : false; // Get an array of the logged in user's favorite activities - $this->my_favs = maybe_unserialize( get_user_meta( $bp->loggedin_user->id, bp_get_user_meta_key( 'bp_favorite_activities' ), true ) ); + $this->my_favs = maybe_unserialize( bp_get_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', true ) ); // Fetch specific activity items based on ID's if ( !empty( $include ) ) @@ -1229,7 +1229,7 @@ function bp_activity_latest_update( $user_id = 0 ) { if ( !$user_id ) $user_id = $bp->displayed_user->id; - if ( !$update = get_user_meta( $user_id, bp_get_user_meta_key( 'bp_latest_update' ), true ) ) + if ( !$update = bp_get_user_meta( $user_id, 'bp_latest_update', true ) ) return false; $latest_update = '"' . apply_filters( 'bp_get_activity_latest_update_excerpt', trim( strip_tags( bp_create_excerpt( $update['content'], 358 ) ) ) ) . '"'; @@ -1347,7 +1347,7 @@ function bp_total_mention_count_for_user( $user_id = 0 ) { function bp_get_total_mention_count_for_user( $user_id = 0 ) { global $bp; - return apply_filters( 'bp_get_total_mention_count_for_user', get_user_meta( $user_id, bp_get_user_meta_key( 'bp_new_mention_count' ), true ) ); + return apply_filters( 'bp_get_total_mention_count_for_user', bp_get_user_meta( $user_id, 'bp_new_mention_count', true ) ); } function bp_send_public_message_link() { Index: bp-core/bp-core-classes.php =================================================================== --- bp-core/bp-core-classes.php (revision 4556) +++ bp-core/bp-core-classes.php (working copy) @@ -136,7 +136,7 @@ class BP_Core_User { * @uses bp_core_get_userurl() Returns the URL with no HTML markup for a user based on their user id * @uses bp_core_get_userlink() Returns a HTML formatted link for a user with the user's full name as the link text * @uses bp_core_get_user_email() Returns the email address for the user based on user ID - * @uses get_user_meta() WordPress function returns the value of passed usermeta name from usermeta table + * @uses bp_get_user_meta() BP function returns the value of passed usermeta name from usermeta table * @uses bp_core_fetch_avatar() Returns HTML formatted avatar for a user * @uses bp_profile_last_updated_date() Returns the last updated date for a user. */ @@ -166,7 +166,7 @@ class BP_Core_User { $this->avatar = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'full' ) ); $this->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb' ) ); $this->avatar_mini = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'width' => 30, 'height' => 30 ) ); - $this->last_active = bp_core_get_last_activity( get_user_meta( $this->id, bp_get_user_meta_key( 'last_activity' ), true ), __( 'active %s ago', 'buddypress' ) ); + $this->last_active = bp_core_get_last_activity( bp_get_user_meta( $this->id, 'last_activity', true ), __( 'active %s ago', 'buddypress' ) ); } /** Index: bp-core/bp-core-functions.php =================================================================== --- bp-core/bp-core-functions.php (revision 4556) +++ bp-core/bp-core-functions.php (working copy) @@ -655,7 +655,7 @@ function bp_core_time_since( $older_date, $newer_date = false ) { * * @package BuddyPress Core * @global $userdata WordPress user data for the current logged in user. - * @uses update_user_meta() WordPress function to update user metadata in the usermeta table. + * @uses bp_update_user_meta() BP function to update user metadata in the usermeta table. */ function bp_core_record_activity() { global $bp; @@ -663,7 +663,7 @@ function bp_core_record_activity() { if ( !is_user_logged_in() ) return false; - $activity = get_user_meta( $bp->loggedin_user->id, bp_get_user_meta_key( 'last_activity' ), true ); + $activity = bp_get_user_meta( $bp->loggedin_user->id, 'last_activity', true ); if ( !is_numeric( $activity ) ) $activity = strtotime( $activity ); @@ -672,7 +672,7 @@ function bp_core_record_activity() { $current_time = bp_core_current_time(); if ( empty( $activity ) || strtotime( $current_time ) >= strtotime( '+5 minutes', $activity ) ) - update_user_meta( $bp->loggedin_user->id, bp_get_user_meta_key( 'last_activity' ), $current_time ); + bp_update_user_meta( $bp->loggedin_user->id, 'last_activity', $current_time ); } add_action( 'wp_head', 'bp_core_record_activity' ); @@ -1024,14 +1024,11 @@ function bp_is_root_blog( $blog_id = false ) { * order to allow plugins to enable multiple instances of BuddyPress on a single WP installation, * BP's usermeta keys are filtered with this function, so that they can be altered on the fly. * - * Plugin authors who access or modify metadata created by BuddyPress should use - * this function exclusively in the context of the _user_meta() functions. For example, + * Plugin authors should use BP's _user_meta() functions, which bakes in bp_get_user_meta_key(). + * $last_active = bp_get_user_meta( $user_id, 'last_activity', true ); + * If you have to use WP's _user_meta() functions for some reason, you should use this function, eg * $last_active = get_user_meta( $user_id, bp_get_user_meta_key( 'last_activity' ), true ); - * Do not hardcode these keys. - * - * If your plugin introduces custom user metadata that might change between multiple BP instances - * on a single WP installation, you are strongly recommended to use this function when storing and - * retrieving metadata. + * If using the WP functions, do not not hardcode your meta keys. * * @package BuddyPress * @since 1.3 @@ -1044,6 +1041,69 @@ function bp_get_user_meta_key( $key = false ) { return apply_filters( 'bp_get_user_meta_key', $key ); } +/** + * Get a piece of usermeta + * + * This is a wrapper for get_user_meta() that allows for easy use of bp_get_user_meta_key(), thereby + * increasing compatibility with non-standard BP setups. + * + * @package BuddyPress + * @since 1.3 + * + * @uses bp_get_user_meta_key() For a filterable version of the meta key + * @uses get_user_meta() See get_user_meta() docs for more details on parameters + * @param int $user_id The id of the user whose meta you're fetching + * @param string $key The meta key to retrieve. + * @param bool $single Whether to return a single value. + * @return mixed Will be an array if $single is false. Will be value of meta data field if $single + * is true. + */ +function bp_get_user_meta( $user_id, $key, $single = false ) { + return get_user_meta( $user_id, bp_get_user_meta_key( $key ), $single ); +} + +/** + * Update a piece of usermeta + * + * This is a wrapper for update_user_meta() that allows for easy use of bp_get_user_meta_key(), + * thereby increasing compatibility with non-standard BP setups. + * + * @package BuddyPress + * @since 1.3 + * + * @uses bp_get_user_meta_key() For a filterable version of the meta key + * @uses update_user_meta() See update_user_meta() docs for more details on parameters + * @param int $user_id The id of the user whose meta you're setting + * @param string $key The meta key to set. + * @param mixed $value Metadata value. + * @param mixed $prev_value Optional. Previous value to check before removing. + * @return bool False on failure, true if success. + */ +function bp_update_user_meta( $user_id, $key, $value, $prev_value = '' ) { + return update_user_meta( $user_id, bp_get_user_meta_key( $key ), $value, $prev_value ); +} + +/** + * Delete a piece of usermeta + * + * This is a wrapper for delete_user_meta() that allows for easy use of bp_get_user_meta_key(), + * thereby increasing compatibility with non-standard BP setups. + * + * @package BuddyPress + * @since 1.3 + * + * @uses bp_get_user_meta_key() For a filterable version of the meta key + * @uses delete_user_meta() See delete_user_meta() docs for more details on parameters + * @param int $user_id The id of the user whose meta you're deleting + * @param string $key The meta key to delete. + * @param mixed $value Optional. Metadata value. + * @return bool False for failure. True for success. + */ +function bp_delete_user_meta( $user_id, $key, $value = '' ) { + return delete_user_meta( $user_id, bp_get_user_meta_key( $key ), $value ); +} + + /** Global Manipulators *******************************************************/ /** Index: bp-friends/bp-friends-classes.php =================================================================== --- bp-friends/bp-friends-classes.php (revision 4556) +++ bp-friends/bp-friends-classes.php (working copy) @@ -132,10 +132,10 @@ class BP_Friends_Friendship { $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d OR friend_user_id = %d) AND is_confirmed = 1", $user_id, $user_id ) ); // Do not update meta if user has never had friends - if ( !$count && !get_user_meta( $user_id, bp_get_user_meta_key( 'total_friend_count' ), true ) ) + if ( !$count && !bp_get_user_meta( $user_id, 'total_friend_count', true ) ) return 0; - update_user_meta( $user_id, bp_get_user_meta_key( 'total_friend_count' ), (int)$count ); + bp_update_user_meta( $user_id, 'total_friend_count', (int)$count ); return (int)$count; } Index: bp-friends/bp-friends-functions.php =================================================================== --- bp-friends/bp-friends-functions.php (revision 4556) +++ bp-friends/bp-friends-functions.php (working copy) @@ -155,7 +155,7 @@ function friends_get_total_friend_count( $user_id = 0 ) { $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_user_meta( $user_id, bp_get_user_meta_key( 'total_friend_count' ), true ); + $count = bp_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' ); } @@ -258,14 +258,12 @@ function friends_is_friendship_confirmed( $friendship_id ) { function friends_update_friend_totals( $initiator_user_id, $friend_user_id, $status = 'add' ) { global $bp; - $meta_key = bp_get_user_meta_key( 'total_friend_count' ); - if ( 'add' == $status ) { - update_user_meta( $initiator_user_id, $meta_key, (int)get_user_meta( $initiator_user_id, $meta_key, true ) + 1 ); - update_user_meta( $friend_user_id, $meta_key, (int)get_user_meta( $friend_user_id, $meta_key, true ) + 1 ); + bp_update_user_meta( $initiator_user_id, 'total_friend_count', (int)bp_get_user_meta( $initiator_user_id, 'total_friend_count', true ) + 1 ); + bp_update_user_meta( $friend_user_id, 'total_friend_count', (int)bp_get_user_meta( $friend_user_id, 'total_friend_count', true ) + 1 ); } else { - update_user_meta( $initiator_user_id, $meta_key, (int)get_user_meta( $initiator_user_id, $meta_key, true ) - 1 ); - update_user_meta( $friend_user_id, $meta_key, (int)get_user_meta( $friend_user_id, $meta_key, true ) - 1 ); + bp_update_user_meta( $initiator_user_id, 'total_friend_count', (int)bp_get_user_meta( $initiator_user_id, 'total_friend_count', true ) - 1 ); + bp_update_user_meta( $friend_user_id, 'total_friend_count', (int)bp_get_user_meta( $friend_user_id, 'total_friend_count', true ) - 1 ); } } @@ -277,7 +275,7 @@ function friends_remove_data( $user_id ) { BP_Friends_Friendship::delete_all_for_user($user_id); // Remove usermeta - delete_user_meta( $user_id, bp_get_user_meta_key( 'total_friend_count' ) ); + bp_delete_user_meta( $user_id, 'total_friend_count' ); // Remove friendship requests FROM user bp_members_delete_notifications_from_user( $user_id, $bp->friends->id, 'friendship_request' ); Index: bp-friends/bp-friends-notifications.php =================================================================== --- bp-friends/bp-friends-notifications.php (revision 4556) +++ bp-friends/bp-friends-notifications.php (working copy) @@ -5,7 +5,7 @@ function friends_notification_new_request( $friendship_id, $initiator_id, $frien $initiator_name = bp_core_get_user_displayname( $initiator_id ); - if ( 'no' == get_user_meta( (int)$friend_id, bp_get_user_meta_key( 'notification_friends_friendship_request' ), true ) ) + if ( 'no' == bp_get_user_meta( (int)$friend_id, 'notification_friends_friendship_request', true ) ) return false; $ud = get_userdata( $friend_id ); @@ -50,7 +50,7 @@ function friends_notification_accepted_request( $friendship_id, $initiator_id, $ $friend_name = bp_core_get_user_displayname( $friend_id ); - if ( 'no' == get_user_meta( (int)$initiator_id, bp_get_user_meta_key( 'notification_friends_friendship_accepted' ), true ) ) + if ( 'no' == bp_get_user_meta( (int)$initiator_id, 'notification_friends_friendship_accepted', true ) ) return false; $ud = get_userdata( $initiator_id ); Index: bp-friends/bp-friends-screens.php =================================================================== --- bp-friends/bp-friends-screens.php (revision 4556) +++ bp-friends/bp-friends-screens.php (working copy) @@ -54,10 +54,10 @@ function friends_screen_requests() { function friends_screen_notification_settings() { global $bp; - if ( !$send_requests = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_friends_friendship_request' ), true ) ) + if ( !$send_requests = bp_get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_request', true ) ) $send_requests = 'yes'; - if ( !$accept_requests = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_friends_friendship_accepted' ), true ) ) + if ( !$accept_requests = bp_get_user_meta( $bp->displayed_user->id, 'notification_friends_friendship_accepted', true ) ) $accept_requests = 'yes'; ?> Index: bp-groups/bp-groups-classes.php =================================================================== --- bp-groups/bp-groups-classes.php (revision 4556) +++ bp-groups/bp-groups-classes.php (working copy) @@ -730,9 +730,9 @@ Class BP_Groups_Member { groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) - 1 ) ); - $group_count = get_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), true ); + $group_count = bp_get_user_meta( $this->user_id, 'total_group_count', true ); if ( !empty( $group_count ) ) - update_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), (int)$group_count - 1 ); + bp_update_user_meta( $this->user_id, 'total_group_count', (int)$group_count - 1 ); return $this->save(); } @@ -746,7 +746,7 @@ Class BP_Groups_Member { $this->is_banned = 0; groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) + 1 ) ); - update_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), (int)get_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), true ) + 1 ); + bp_update_user_meta( $this->user_id, 'total_group_count', (int)bp_get_user_meta( $this->user_id, 'total_group_count', true ) + 1 ); return $this->save(); } @@ -758,7 +758,7 @@ Class BP_Groups_Member { $this->is_confirmed = 1; $this->date_modified = bp_core_current_time(); - update_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), (int)get_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), true ) + 1 ); + bp_update_user_meta( $this->user_id, 'total_group_count', (int)bp_get_user_meta( $this->user_id, 'total_group_count', true ) + 1 ); } function accept_request() { @@ -767,7 +767,7 @@ Class BP_Groups_Member { $this->is_confirmed = 1; $this->date_modified = bp_core_current_time(); - update_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), (int)get_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), true ) + 1 ); + bp_update_user_meta( $this->user_id, 'total_group_count', (int)bp_get_user_meta( $this->user_id, 'total_group_count', true ) + 1 ); } function remove() { @@ -780,9 +780,9 @@ Class BP_Groups_Member { groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) - 1 ) ); - $group_count = get_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), true ); + $group_count = bp_get_user_meta( $this->user_id, 'total_group_count', true ); if ( !empty( $group_count ) ) - update_user_meta( $this->user_id, bp_get_user_meta_key( 'total_group_count' ), (int)$group_count - 1 ); + bp_update_user_meta( $this->user_id, 'total_group_count', (int)$group_count - 1 ); return $result; } Index: bp-groups/bp-groups-functions.php =================================================================== --- bp-groups/bp-groups-functions.php (revision 4556) +++ bp-groups/bp-groups-functions.php (working copy) @@ -252,7 +252,7 @@ function groups_leave_group( $group_id, $user_id = 0 ) { groups_update_groupmeta( $group_id, 'total_member_count', (int) groups_get_groupmeta( $group_id, 'total_member_count') - 1 ); // Modify user's group memberhip count - update_user_meta( $user_id, bp_get_user_meta_key( 'total_group_count' ), (int) get_user_meta( $user_id, bp_get_user_meta_key( 'total_group_count' ), true ) - 1 ); + bp_update_user_meta( $user_id, 'total_group_count', (int) bp_get_user_meta( $user_id, 'total_group_count', true ) - 1 ); /** * If the user joined this group less than five minutes ago, remove the Index: bp-groups/bp-groups-notifications.php =================================================================== --- bp-groups/bp-groups-notifications.php (revision 4556) +++ bp-groups/bp-groups-notifications.php (working copy) @@ -9,7 +9,7 @@ function groups_notification_group_updated( $group_id ) { $user_ids = BP_Groups_Member::get_group_member_ids( $group->id ); foreach ( (array)$user_ids as $user_id ) { - if ( 'no' == get_user_meta( $user_id, bp_get_user_meta_key( 'notification_groups_group_updated' ), true ) ) continue; + if ( 'no' == bp_get_user_meta( $user_id, 'notification_groups_group_updated', true ) ) continue; $ud = bp_core_get_core_userdata( $user_id ); @@ -47,7 +47,7 @@ function groups_notification_new_membership_request( $requesting_user_id, $admin bp_members_add_notification( $requesting_user_id, $admin_id, 'groups', 'new_membership_request', $group_id ); - if ( 'no' == get_user_meta( $admin_id, bp_get_user_meta_key( 'notification_groups_membership_request' ), true ) ) + if ( 'no' == bp_get_user_meta( $admin_id, 'notification_groups_membership_request', true ) ) return false; $requesting_user_name = bp_core_get_user_displayname( $requesting_user_id ); @@ -99,7 +99,7 @@ function groups_notification_membership_request_completed( $requesting_user_id, else bp_members_add_notification( $group_id, $requesting_user_id, 'groups', 'membership_request_rejected' ); - if ( 'no' == get_user_meta( $requesting_user_id, bp_get_user_meta_key( 'notification_membership_request_completed' ), true ) ) + if ( 'no' == bp_get_user_meta( $requesting_user_id, 'notification_membership_request_completed', true ) ) return false; $group = new BP_Groups_Group( $group_id ); @@ -160,7 +160,7 @@ function groups_notification_promoted_member( $user_id, $group_id ) { // Post a screen notification first. bp_members_add_notification( $group_id, $user_id, 'groups', $type ); - if ( 'no' == get_user_meta( $user_id, bp_get_user_meta_key( 'notification_groups_admin_promotion' ), true ) ) + if ( 'no' == bp_get_user_meta( $user_id, 'notification_groups_admin_promotion', true ) ) return false; $group = new BP_Groups_Group( $group_id ); @@ -210,7 +210,7 @@ function groups_notification_group_invites( &$group, &$member, $inviter_user_id // Post a screen notification first. bp_members_add_notification( $group->id, $invited_user_id, 'groups', 'group_invite' ); - if ( 'no' == get_user_meta( $invited_user_id, bp_get_user_meta_key( 'notification_groups_invite' ), true ) ) + if ( 'no' == bp_get_user_meta( $invited_user_id, 'notification_groups_invite', true ) ) return false; $invited_ud = bp_core_get_core_userdata($invited_user_id); @@ -271,7 +271,7 @@ function groups_at_message_notification( $content, $poster_user_id, $group_id, $ continue; // Now email the user with the contents of the message (if they have enabled email notifications) - if ( 'no' != get_user_meta( $user_id, bp_get_user_meta_key( 'notification_activity_new_mention' ), true ) ) { + if ( 'no' != bp_get_user_meta( $user_id, 'notification_activity_new_mention', true ) ) { $poster_name = bp_core_get_user_displayname( $poster_user_id ); $message_link = bp_activity_get_permalink( $activity_id ); Index: bp-groups/bp-groups-screens.php =================================================================== --- bp-groups/bp-groups-screens.php (revision 4556) +++ bp-groups/bp-groups-screens.php (working copy) @@ -793,19 +793,24 @@ function groups_screen_group_admin_delete_group() { } add_action( 'bp_screens', 'groups_screen_group_admin_delete_group' ); +/** + * Renders the group settings fields on the Notification Settings page + * + * @package BuddyPress + */ function groups_screen_notification_settings() { global $bp; - if ( !$group_invite = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_groups_invite' ), true ) ) + if ( !$group_invite = bp_get_user_meta( $bp->displayed_user->id, 'notification_groups_invite', true ) ) $group_invite = 'yes'; - if ( !$group_update = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_groups_group_updated' ), true ) ) + if ( !$group_update = bp_get_user_meta( $bp->displayed_user->id, 'notification_groups_group_updated', true ) ) $group_update = 'yes'; - if ( !$group_promo = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_groups_admin_promotion' ), true ) ) + if ( !$group_promo = bp_get_user_meta( $bp->displayed_user->id, 'notification_groups_admin_promotion', true ) ) $group_promo = 'yes'; - if ( !$group_request = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_groups_membership_request' ), true ) ) + if ( !$group_request = bp_get_user_meta( $bp->displayed_user->id, 'notification_groups_membership_request', true ) ) $group_request = 'yes'; ?> Index: bp-members/bp-members-functions.php =================================================================== --- bp-members/bp-members-functions.php (revision 4556) +++ bp-members/bp-members-functions.php (working copy) @@ -619,11 +619,11 @@ add_filter( 'authenticate', 'bp_core_boot_spammer', 30, 2 ); * * @package BuddyPress Core * @param $user_id The user id for the user to delete usermeta for - * @uses delete_user_meta() deletes a row from the wp_usermeta table based on meta_key + * @uses bp_delete_user_meta() deletes a row from the wp_usermeta table based on meta_key */ function bp_core_remove_data( $user_id ) { // Remove usermeta - delete_user_meta( $user_id, bp_get_user_meta_key( 'last_activity' ) ); + bp_delete_user_meta( $user_id, 'last_activity' ); // Flush the cache to remove the user from all cached objects wp_cache_flush(); Index: bp-members/bp-members-template.php =================================================================== --- bp-members/bp-members-template.php (revision 4556) +++ bp-members/bp-members-template.php (working copy) @@ -750,7 +750,7 @@ function bp_last_activity( $user_id = 0 ) { if ( empty( $user_id ) ) $user_id = $bp->displayed_user->id; - $last_activity = bp_core_get_last_activity( get_user_meta( $user_id, bp_get_user_meta_key( 'last_activity' ), true ), __('active %s ago', 'buddypress') ); + $last_activity = bp_core_get_last_activity( bp_get_user_meta( $user_id, 'last_activity', true ), __('active %s ago', 'buddypress') ); return apply_filters( 'bp_get_last_activity', $last_activity ); } Index: bp-messages/bp-messages-classes.php =================================================================== --- bp-messages/bp-messages-classes.php (revision 4556) +++ bp-messages/bp-messages-classes.php (working copy) @@ -419,7 +419,7 @@ Class BP_Messages_Notice { // Now deactivate all notices apart from the new one. $wpdb->query( $wpdb->prepare( "UPDATE {$bp->messages->table_name_notices} SET is_active = 0 WHERE id != %d", $id ) ); - update_user_meta( $bp->loggedin_user->id, bp_get_user_meta_key( 'last_activity' ), bp_core_current_time() ); + bp_update_user_meta( $bp->loggedin_user->id, 'last_activity', bp_core_current_time() ); do_action_ref_array( 'messages_notice_after_save', array( &$this ) ); Index: bp-messages/bp-messages-notifications.php =================================================================== --- bp-messages/bp-messages-notifications.php (revision 4556) +++ bp-messages/bp-messages-notifications.php (working copy) @@ -9,7 +9,7 @@ function messages_notification_new_message( $args ) { $sender_name = bp_core_get_user_displayname( $sender_id ); foreach( $recipients as $recipient ) { - if ( $sender_id == $recipient->user_id || 'no' == get_user_meta( $recipient->user_id, bp_get_user_meta_key( 'notification_messages_new_message' ), true ) ) + if ( $sender_id == $recipient->user_id || 'no' == bp_get_user_meta( $recipient->user_id, 'notification_messages_new_message', true ) ) continue; // User data and links Index: bp-messages/bp-messages-screens.php =================================================================== --- bp-messages/bp-messages-screens.php (revision 4556) +++ bp-messages/bp-messages-screens.php (working copy) @@ -133,10 +133,10 @@ function messages_screen_notification_settings() { return; } - if ( !$new_messages = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_messages_new_message' ), true ) ) + if ( !$new_messages = bp_get_user_meta( $bp->displayed_user->id, 'notification_messages_new_message', true ) ) $new_messages = 'yes'; - if ( !$new_notices = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'notification_messages_new_notice' ), true ) ) + if ( !$new_notices = bp_get_user_meta( $bp->displayed_user->id, 'notification_messages_new_notice', true ) ) $new_notices = 'yes'; ?> Index: bp-messages/bp-messages-template.php =================================================================== --- bp-messages/bp-messages-template.php (revision 4556) +++ bp-messages/bp-messages-template.php (working copy) @@ -503,7 +503,7 @@ function bp_message_get_notices() { if ( empty( $notice ) ) return false; - $closed_notices = get_user_meta( $userdata->ID, bp_get_user_meta_key( 'closed_notices' ), true ); + $closed_notices = bp_get_user_meta( $userdata->ID, 'closed_notices', true ); if ( !$closed_notices ) $closed_notices = array(); Index: bp-settings/bp-settings-actions.php =================================================================== --- bp-settings/bp-settings-actions.php (revision 4556) +++ bp-settings/bp-settings-actions.php (working copy) @@ -125,7 +125,7 @@ function bp_settings_screen_notification_settings() { if ( isset( $_POST['notifications'] ) ) { foreach ( (array)$_POST['notifications'] as $key => $value ) { if ( $meta_key = bp_get_user_meta_key( $key ) ) - update_user_meta( (int)$bp->displayed_user->id, $meta_key, $value ); + bp_update_user_meta( (int)$bp->displayed_user->id, $meta_key, $value ); } } Index: bp-themes/bp-default/_inc/ajax.php =================================================================== --- bp-themes/bp-default/_inc/ajax.php (revision 4556) +++ bp-themes/bp-default/_inc/ajax.php (working copy) @@ -502,11 +502,11 @@ function bp_dtheme_ajax_close_notice() { if ( !isset( $_POST['notice_id'] ) ) { echo "-1

" . __('There was a problem closing the notice.', 'buddypress') . '

'; } else { - $notice_ids = get_user_meta( $userdata->ID, bp_get_user_meta_key( 'closed_notices' ), true ); + $notice_ids = bp_get_user_meta( $userdata->ID, 'closed_notices', true ); $notice_ids[] = (int) $_POST['notice_id']; - update_user_meta( $userdata->ID, bp_get_user_meta_key( 'closed_notices' ), $notice_ids ); + bp_update_user_meta( $userdata->ID, 'closed_notices', $notice_ids ); } } add_action( 'wp_ajax_messages_close_notice', 'bp_dtheme_ajax_close_notice' ); Index: bp-xprofile/bp-xprofile-template.php =================================================================== --- bp-xprofile/bp-xprofile-template.php (revision 4556) +++ bp-xprofile/bp-xprofile-template.php (working copy) @@ -710,7 +710,7 @@ function bp_profile_last_updated() { function bp_get_profile_last_updated() { global $bp; - $last_updated = get_user_meta( $bp->displayed_user->id, bp_get_user_meta_key( 'profile_last_updated' ), true ); + $last_updated = bp_get_user_meta( $bp->displayed_user->id, 'profile_last_updated', true ); if ( $last_updated ) return apply_filters( 'bp_get_profile_last_updated', sprintf( __('Profile updated %s ago', 'buddypress'), bp_core_time_since( strtotime( $last_updated ) ) ) );