Index: bp-activity.php =================================================================== --- bp-activity.php (revision 3158) +++ bp-activity.php (working copy) @@ -193,14 +193,14 @@ 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" /> + loggedin_user->id, 'notification_activity_new_mention' ) || 'yes' == get_user_meta( $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, 'notification_activity_new_reply' ) || 'yes' == get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_reply' ) ) { ?>checked="checked" /> + loggedin_user->id, 'notification_activity_new_reply' ) ) { ?>checked="checked" /> @@ -754,7 +754,7 @@ 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' ); if ( !empty( $latest_update ) ) { if ( in_array( (int)$latest_update['id'], (array)$activity_ids_deleted ) ) delete_usermeta( $user_id, 'bp_latest_update' ); @@ -908,7 +908,7 @@ } 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' ) ); $existing_favs = bp_activity_get_specific( array( 'activity_ids' => $my_favs ) ); foreach( (array)$existing_favs['activities'] as $fav ) @@ -927,7 +927,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' ) ); $my_favs[] = $activity_id; /* Update the total number of users who have favorited this activity */ @@ -953,7 +953,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' ) ); $my_favs = array_flip( (array) $my_favs ); unset( $my_favs[$activity_id] ); $my_favs = array_unique( array_flip( $my_favs ) ); Index: bp-activity/bp-activity-classes.php =================================================================== --- bp-activity/bp-activity-classes.php (revision 3158) +++ bp-activity/bp-activity-classes.php (working copy) @@ -537,7 +537,7 @@ function total_favorite_count( $user_id ) { global $bp; - if ( !$favorite_activity_entries = get_usermeta( $user_id, 'bp_favorite_activities' ) ) + if ( !$favorite_activity_entries = get_user_meta( $user_id, 'bp_favorite_activities' ) ) return 0; return count( maybe_unserialize( $favorite_activity_entries ) ); Index: bp-activity/bp-activity-filters.php =================================================================== --- bp-activity/bp-activity-filters.php (revision 3158) +++ bp-activity/bp-activity-filters.php (working copy) @@ -105,7 +105,7 @@ continue; /* Increase the number of new @ mentions for the user */ - $new_mention_count = (int)get_usermeta( $user_id, 'bp_new_mention_count' ); + $new_mention_count = (int)get_user_meta( $user_id, 'bp_new_mention_count' ); update_usermeta( $user_id, 'bp_new_mention_count', $new_mention_count + 1 ); $content = str_replace( "@$username", "@$username", $content ); Index: bp-activity/bp-activity-notifications.php =================================================================== --- bp-activity/bp-activity-notifications.php (revision 3158) +++ bp-activity/bp-activity-notifications.php (working copy) @@ -16,7 +16,7 @@ continue; // Now email the user with the contents of the message (if they have enabled email notifications) - if ( 'no' != get_usermeta( $receiver_user_id, 'notification_activity_new_mention' ) ) { + if ( 'no' != get_user_meta( $receiver_user_id, 'notification_activity_new_mention' ) ) { $poster_name = bp_core_get_user_displayname( $poster_user_id ); $message_link = bp_activity_get_permalink( $activity_id ); @@ -60,7 +60,7 @@ $original_activity = new BP_Activity_Activity( $activity_id ); - if ( $original_activity->user_id != $commenter_id && 'no' != get_usermeta( $original_activity->user_id, 'notification_activity_new_reply' ) ) { + if ( $original_activity->user_id != $commenter_id && 'no' != get_user_meta( $original_activity->user_id, 'notification_activity_new_reply' ) ) { $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/'; @@ -102,7 +102,7 @@ $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_usermeta( $parent_comment->user_id, 'notification_activity_new_reply' ) ) { + if ( $parent_comment->user_id != $commenter_id && $original_activity->user_id != $parent_comment->user_id && 'no' != get_user_meta( $parent_comment->user_id, 'notification_activity_new_reply' ) ) { $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-templatetags.php =================================================================== --- bp-activity/bp-activity-templatetags.php (revision 3158) +++ bp-activity/bp-activity-templatetags.php (working copy) @@ -25,7 +25,7 @@ $this->disable_blogforum_replies = $bp->site_options['bp-disable-blogforum-comments']; /* Get an array of the logged in user's favorite activities */ - $this->my_favs = maybe_unserialize( get_usermeta( $bp->loggedin_user->id, 'bp_favorite_activities' ) ); + $this->my_favs = maybe_unserialize( get_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities' ) ); if ( !empty( $include ) ) { /* Fetch specific activity items based on ID's */ @@ -734,7 +734,7 @@ if ( !$user_id ) $user_id = $bp->displayed_user->id; - if ( !$update = get_usermeta( $user_id, 'bp_latest_update' ) ) + if ( !$update = get_user_meta( $user_id, 'bp_latest_update' ) ) return false; $latest_update = '"' . trim( strip_tags( bp_create_excerpt( $update['content'], 40 ) ) ) . '"'; @@ -836,7 +836,7 @@ echo bp_get_total_favorite_count_for_user( $user_id ); } function bp_get_total_mention_count_for_user( $user_id = false ) { - return apply_filters( 'bp_get_total_mention_count_for_user', get_usermeta( $user_id, 'bp_new_mention_count' ) ); + return apply_filters( 'bp_get_total_mention_count_for_user', get_user_meta( $user_id, 'bp_new_mention_count' ) ); } function bp_send_public_message_link() { Index: bp-core.php =================================================================== --- bp-core.php (revision 3158) +++ bp-core.php (working copy) @@ -517,7 +517,7 @@ * @package BuddyPress Core * @global $current_user WordPress global variable containing current logged in user information * @param user_id The ID of the user. - * @uses get_usermeta() WordPress function to get the usermeta for a user. + * @uses get_user_meta() WordPress function to get the usermeta for a user. */ function bp_core_get_user_domain( $user_id, $user_nicename = false, $user_login = false ) { global $bp; @@ -1413,7 +1413,7 @@ if ( !is_user_logged_in() ) return false; - $activity = get_usermeta( $bp->loggedin_user->id, 'last_activity' ); + $activity = get_user_meta( $bp->loggedin_user->id, 'last_activity' ); if ( !is_numeric( $activity ) ) $activity = strtotime( $activity ); Index: bp-core/bp-core-classes.php =================================================================== --- bp-core/bp-core-classes.php (revision 3158) +++ bp-core/bp-core-classes.php (working copy) @@ -50,7 +50,7 @@ * @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_usermeta() WordPress function returns the value of passed usermeta name from usermeta table + * @uses get_user_meta() WordPress 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. */ @@ -79,7 +79,7 @@ $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_usermeta( $this->id, 'last_activity' ), __( 'active %s ago', 'buddypress' ) ); + $this->last_active = bp_core_get_last_activity( get_user_meta( $this->id, 'last_activity' ), __( 'active %s ago', 'buddypress' ) ); } function populate_extras() { Index: bp-core/bp-core-signup.php =================================================================== --- bp-core/bp-core-signup.php (revision 3158) +++ bp-core/bp-core-signup.php (working copy) @@ -498,12 +498,12 @@ /* Add the user's fullname to Xprofile */ if ( function_exists( 'xprofile_set_field_data' ) ) { - $firstname = get_usermeta( $user_id, 'first_name' ); - $lastname = ' ' . get_usermeta( $user_id, 'last_name' ); + $firstname = get_user_meta( $user_id, 'first_name' ); + $lastname = ' ' . get_user_meta( $user_id, 'last_name' ); $name = $firstname . $lastname; if ( empty( $name ) || ' ' == $name ) - $name = get_usermeta( $user_id, 'nickname' ); + $name = get_user_meta( $user_id, 'nickname' ); xprofile_set_field_data( 1, $user_id, $name ); } Index: bp-core/bp-core-templatetags.php =================================================================== --- bp-core/bp-core-templatetags.php (revision 3158) +++ bp-core/bp-core-templatetags.php (working copy) @@ -681,7 +681,7 @@ if ( !$user_id ) $user_id = $bp->displayed_user->id; - $last_activity = bp_core_get_last_activity( get_usermeta( $user_id, 'last_activity' ), __('active %s ago', 'buddypress') ); + $last_activity = bp_core_get_last_activity( get_user_meta( $user_id, 'last_activity' ), __('active %s ago', 'buddypress') ); if ( $echo ) echo apply_filters( 'bp_last_activity', $last_activity ); Index: bp-forums.php =================================================================== --- bp-forums.php (revision 3158) +++ bp-forums.php (working copy) @@ -500,7 +500,7 @@ function bp_forums_filter_caps( $allcaps ) { global $bp, $wp_roles, $bb_table_prefix; - $bb_cap = get_usermeta( $bp->loggedin_user->id, $bb_table_prefix . 'capabilities' ); + $bb_cap = get_user_meta( $bp->loggedin_user->id, $bb_table_prefix . 'capabilities' ); if ( empty( $bb_cap ) ) return $allcaps; Index: bp-friends.php =================================================================== --- bp-friends.php (revision 3158) +++ bp-friends.php (working copy) @@ -112,14 +112,14 @@ - 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_request') || 'yes' == get_user_meta( $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_accepted') || 'yes' == get_user_meta( $current_user->id,'notification_friends_friendship_accepted') ) { ?>checked="checked" /> + id,'notification_friends_friendship_accepted') ) { ?>checked="checked" /> @@ -443,7 +443,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' ); if ( empty( $count ) ) $count = 0; wp_cache_set( 'bp_total_friend_count_' . $user_id, $count, 'bp' ); } @@ -546,11 +546,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_usermeta( $initiator_user_id, 'total_friend_count', (int)get_user_meta( $initiator_user_id, 'total_friend_count' ) + 1 ); + update_usermeta( $friend_user_id, 'total_friend_count', (int)get_user_meta( $friend_user_id, 'total_friend_count' ) + 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_usermeta( $initiator_user_id, 'total_friend_count', (int)get_user_meta( $initiator_user_id, 'total_friend_count' ) - 1 ); + update_usermeta( $friend_user_id, 'total_friend_count', (int)get_user_meta( $friend_user_id, 'total_friend_count' ) - 1 ); } } Index: bp-friends/bp-friends-notifications.php =================================================================== --- bp-friends/bp-friends-notifications.php (revision 3158) +++ bp-friends/bp-friends-notifications.php (working copy) @@ -5,7 +5,7 @@ $initiator_name = bp_core_get_user_displayname( $initiator_id ); - if ( 'no' == get_usermeta( (int)$friend_id, 'notification_friends_friendship_request' ) ) + if ( 'no' == get_user_meta( (int)$friend_id, 'notification_friends_friendship_request' ) ) return false; $ud = get_userdata( $friend_id ); @@ -47,7 +47,7 @@ $friend_name = bp_core_get_user_displayname( $friend_id ); - if ( 'no' == get_usermeta( (int)$initiator_id, 'notification_friends_friendship_accepted' ) ) + if ( 'no' == get_user_meta( (int)$initiator_id, 'notification_friends_friendship_accepted' ) ) return false; $ud = get_userdata( $initiator_id ); Index: bp-groups.php =================================================================== --- bp-groups.php (revision 3158) +++ bp-groups.php (working copy) @@ -897,26 +897,26 @@ - id, 'notification_groups_invite') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_invite') ) { ?>checked="checked" /> - id, 'notification_groups_invite') ) { ?>checked="checked" /> + id, 'notification_groups_invite') || 'yes' == get_user_meta( $current_user->id, 'notification_groups_invite') ) { ?>checked="checked" /> + id, 'notification_groups_invite') ) { ?>checked="checked" /> - id, 'notification_groups_group_updated') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_group_updated') ) { ?>checked="checked" /> - id, 'notification_groups_group_updated') ) { ?>checked="checked" /> + id, 'notification_groups_group_updated') || 'yes' == get_user_meta( $current_user->id, 'notification_groups_group_updated') ) { ?>checked="checked" /> + id, 'notification_groups_group_updated') ) { ?>checked="checked" /> - id, 'notification_groups_admin_promotion') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_admin_promotion') ) { ?>checked="checked" /> - id, 'notification_groups_admin_promotion') ) { ?>checked="checked" /> + id, 'notification_groups_admin_promotion') || 'yes' == get_user_meta( $current_user->id, 'notification_groups_admin_promotion') ) { ?>checked="checked" /> + id, 'notification_groups_admin_promotion') ) { ?>checked="checked" /> - id, 'notification_groups_membership_request') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_membership_request') ) { ?>checked="checked" /> - id, 'notification_groups_membership_request') ) { ?>checked="checked" /> + id, 'notification_groups_membership_request') || 'yes' == get_user_meta( $current_user->id, 'notification_groups_membership_request') ) { ?>checked="checked" /> + id, 'notification_groups_membership_request') ) { ?>checked="checked" /> @@ -1570,7 +1570,7 @@ 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_usermeta( $user_id, 'total_group_count', (int) get_usermeta( $user_id, 'total_group_count') - 1 ); + update_usermeta( $user_id, 'total_group_count', (int) get_user_meta( $user_id, 'total_group_count') - 1 ); /* If the user joined this group less than five minutes ago, remove the joined_group activity so * users cannot flood the activity stream by joining/leaving the group in quick succession. Index: bp-groups/bp-groups-classes.php =================================================================== --- bp-groups/bp-groups-classes.php (revision 3158) +++ bp-groups/bp-groups-classes.php (working copy) @@ -633,7 +633,7 @@ groups_update_groupmeta( $this->group_id, 'total_member_count', ( (int) groups_get_groupmeta( $this->group_id, 'total_member_count' ) - 1 ) ); - $group_count = get_usermeta( $this->user_id, 'total_group_count' ); + $group_count = get_user_meta( $this->user_id, 'total_group_count' ); if ( !empty( $group_count ) ) update_usermeta( $this->user_id, 'total_group_count', (int)$group_count - 1 ); @@ -647,7 +647,7 @@ $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_usermeta( $this->user_id, 'total_group_count', (int)get_usermeta( $this->user_id, 'total_group_count' ) + 1 ); + update_usermeta( $this->user_id, 'total_group_count', (int)get_user_meta( $this->user_id, 'total_group_count' ) + 1 ); return $this->save(); } Index: bp-groups/bp-groups-notifications.php =================================================================== --- bp-groups/bp-groups-notifications.php (revision 3158) +++ bp-groups/bp-groups-notifications.php (working copy) @@ -8,7 +8,7 @@ $user_ids = BP_Groups_Member::get_group_member_ids( $group->id ); foreach ( (array)$user_ids as $user_id ) { - if ( 'no' == get_usermeta( $user_id, 'notification_groups_group_updated' ) ) continue; + if ( 'no' == get_user_meta( $user_id, 'notification_groups_group_updated' ) ) continue; $ud = bp_core_get_core_userdata( $user_id ); @@ -44,7 +44,7 @@ bp_core_add_notification( $requesting_user_id, $admin_id, 'groups', 'new_membership_request', $group_id ); - if ( 'no' == get_usermeta( $admin_id, 'notification_groups_membership_request' ) ) + if ( 'no' == get_user_meta( $admin_id, 'notification_groups_membership_request' ) ) return false; $requesting_user_name = bp_core_get_user_displayname( $requesting_user_id ); @@ -93,7 +93,7 @@ else bp_core_add_notification( $group_id, $requesting_user_id, 'groups', 'membership_request_rejected' ); - if ( 'no' == get_usermeta( $requesting_user_id, 'notification_membership_request_completed' ) ) + if ( 'no' == get_user_meta( $requesting_user_id, 'notification_membership_request_completed' ) ) return false; $group = new BP_Groups_Group( $group_id ); @@ -151,7 +151,7 @@ // Post a screen notification first. bp_core_add_notification( $group_id, $user_id, 'groups', $type ); - if ( 'no' == get_usermeta( $user_id, 'notification_groups_admin_promotion' ) ) + if ( 'no' == get_user_meta( $user_id, 'notification_groups_admin_promotion' ) ) return false; $group = new BP_Groups_Group( $group_id ); @@ -199,7 +199,7 @@ // Post a screen notification first. bp_core_add_notification( $group->id, $invited_user_id, 'groups', 'group_invite' ); - if ( 'no' == get_usermeta( $invited_user_id, 'notification_groups_invite' ) ) + if ( 'no' == get_user_meta( $invited_user_id, 'notification_groups_invite' ) ) return false; $invited_ud = bp_core_get_core_userdata($invited_user_id); @@ -258,7 +258,7 @@ continue; // Now email the user with the contents of the message (if they have enabled email notifications) - if ( 'no' != get_usermeta( $user_id, 'notification_activity_new_mention' ) ) { + if ( 'no' != get_user_meta( $user_id, 'notification_activity_new_mention' ) ) { $poster_name = bp_core_get_user_displayname( $poster_user_id ); $message_link = bp_activity_get_permalink( $activity_id ); Index: bp-messages.php =================================================================== --- bp-messages.php (revision 3158) +++ bp-messages.php (working copy) @@ -175,14 +175,14 @@ - id, 'notification_messages_new_message' ) || 'yes' == get_usermeta( $current_user->id, 'notification_messages_new_message' ) ) { ?>checked="checked" /> - id, 'notification_messages_new_message' ) ) { ?>checked="checked" /> + id, 'notification_messages_new_message' ) || 'yes' == get_user_meta( $current_user->id, 'notification_messages_new_message' ) ) { ?>checked="checked" /> + id, 'notification_messages_new_message' ) ) { ?>checked="checked" /> - id, 'notification_messages_new_notice' ) || 'yes' == get_usermeta( $current_user->id, 'notification_messages_new_notice' ) ) { ?>checked="checked" /> - id, 'notification_messages_new_notice' ) ) { ?>checked="checked" /> + id, 'notification_messages_new_notice' ) || 'yes' == get_user_meta( $current_user->id, 'notification_messages_new_notice' ) ) { ?>checked="checked" /> + id, 'notification_messages_new_notice' ) ) { ?>checked="checked" /> Index: bp-messages/bp-messages-notifications.php =================================================================== --- bp-messages/bp-messages-notifications.php (revision 3158) +++ bp-messages/bp-messages-notifications.php (working copy) @@ -7,7 +7,7 @@ $sender_name = bp_core_get_user_displayname( $sender_id ); foreach( $recipients as $recipient ) { - if ( $sender_id == $recipient->user_id || 'no' == get_usermeta( $recipient->user_id, 'notification_messages_new_message' ) ) continue; + if ( $sender_id == $recipient->user_id || 'no' == get_user_meta( $recipient->user_id, 'notification_messages_new_message' ) ) continue; $ud = get_userdata( $recipient->user_id ); $message_link = bp_core_get_user_domain( $recipient->user_id ) . BP_MESSAGES_SLUG .'/'; Index: bp-messages/bp-messages-templatetags.php =================================================================== --- bp-messages/bp-messages-templatetags.php (revision 3158) +++ bp-messages/bp-messages-templatetags.php (working copy) @@ -455,7 +455,7 @@ if ( empty( $notice ) ) return false; - $closed_notices = get_usermeta( $userdata->ID, 'closed_notices' ); + $closed_notices = get_user_meta( $userdata->ID, 'closed_notices' ); if ( !$closed_notices ) $closed_notices = array(); Index: bp-themes/bp-default/_inc/ajax.php =================================================================== --- bp-themes/bp-default/_inc/ajax.php (revision 3158) +++ bp-themes/bp-default/_inc/ajax.php (working copy) @@ -442,7 +442,7 @@ if ( !isset( $_POST['notice_id'] ) ) { echo "-1

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

'; } else { - $notice_ids = get_usermeta( $userdata->ID, 'closed_notices' ); + $notice_ids = get_user_meta( $userdata->ID, 'closed_notices' ); $notice_ids[] = (int) $_POST['notice_id']; Index: bp-xprofile.php =================================================================== --- bp-xprofile.php (revision 3158) +++ bp-xprofile.php (working copy) @@ -874,7 +874,7 @@ * * @package BuddyPress XProfile * @param $user_id The ID of the deleted user - * @uses get_usermeta() Get a user meta value based on meta key from wp_usermeta + * @uses get_user_meta() Get a user meta value based on meta key from wp_usermeta * @uses delete_usermeta() Delete user meta value based on meta key from wp_usermeta * @uses delete_data_for_user() Removes all profile data from the xprofile tables for the user */ @@ -882,8 +882,8 @@ BP_XProfile_ProfileData::delete_data_for_user( $user_id ); /* delete any avatar files. */ - @unlink( get_usermeta( $user_id, 'bp_core_avatar_v1_path' ) ); - @unlink( get_usermeta( $user_id, 'bp_core_avatar_v2_path' ) ); + @unlink( get_user_meta( $user_id, 'bp_core_avatar_v1_path' ) ); + @unlink( get_user_meta( $user_id, 'bp_core_avatar_v2_path' ) ); /* unset the usermeta for avatars from the usermeta table. */ delete_usermeta( $user_id, 'bp_core_avatar_v1' ); Index: bp-xprofile/bp-xprofile-templatetags.php =================================================================== --- bp-xprofile/bp-xprofile-templatetags.php (revision 3158) +++ bp-xprofile/bp-xprofile-templatetags.php (working copy) @@ -637,7 +637,7 @@ function bp_get_profile_last_updated() { global $bp; - $last_updated = get_usermeta( $bp->displayed_user->id, 'profile_last_updated' ); + $last_updated = get_user_meta( $bp->displayed_user->id, 'profile_last_updated' ); if ( $last_updated ) return apply_filters( 'bp_get_profile_last_updated', sprintf( __('Profile updated %s ago', 'buddypress'), bp_core_time_since( strtotime( $last_updated ) ) ) );