Ticket #2523: 2523.001.diff

bp-friends.php

@@ -155 +155 @@
                         <tr>
                                 <td></td>
                                 <td><?php _e( 'A member sends you a friendship request', 'buddypress' ) ?></td>
-                                <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_request]" value="yes" <?php if ( !get_usermeta( $current_user->id,'notification_friends_friendship_request') || 'yes' == get_usermeta( $current_user->id,'notification_friends_friendship_request') ) { ?>checked="checked" <?php } ?>/></td>
-                                <td class="no"><input type="radio" name="notifications[notification_friends_friendship_request]" value="no" <?php if ( get_usermeta( $current_user->id,'notification_friends_friendship_request') == 'no' ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_request]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_friends_friendship_request', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_friends_friendship_request', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="no"><input type="radio" name="notifications[notification_friends_friendship_request]" value="no" <?php if ( get_user_meta( $current_user->id, 'notification_friends_friendship_request', true ) == 'no' ) { ?>checked="checked" <?php } ?>/></td>
                         </tr>
                         <tr>
                                 <td></td>
                                 <td><?php _e( 'A member accepts your friendship request', 'buddypress' ) ?></td>
-                                <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="yes" <?php if ( !get_usermeta( $current_user->id,'notification_friends_friendship_accepted') || 'yes' == get_usermeta( $current_user->id,'notification_friends_friendship_accepted') ) { ?>checked="checked" <?php } ?>/></td>
-                                <td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id,'notification_friends_friendship_accepted') ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_friends_friendship_accepted', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_friends_friendship_accepted', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="no" <?php if ( 'no' == get_user_meta( $current_user->id, 'notification_friends_friendship_accepted', true ) ) { ?>checked="checked" <?php } ?>/></td>
                         </tr>
 
                         <?php do_action( 'friends_screen_notification_settings' ); ?>
@@ -487 +487 @@
                 $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' );
         }
@@ -590 +590 @@
 
 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 );
         }
 }
 
@@ -602 +602 @@
         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' );

bp-activity.php

@@ -275 +275 @@
                         <tr>
                                 <td></td>
                                 <td><?php printf( __( 'A member mentions you in an update using "@%s"', 'buddypress' ), bp_core_get_username( $bp->loggedin_user->id, $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login ) ) ?></td>
-                                <td class="yes"><input type="radio" name="notifications[notification_activity_new_mention]" value="yes" <?php if ( !get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_mention' ) || 'yes' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_mention' ) ) { ?>checked="checked" <?php } ?>/></td>
-                                <td class="no"><input type="radio" name="notifications[notification_activity_new_mention]" value="no" <?php if ( 'no' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_mention' ) ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="yes"><input type="radio" name="notifications[notification_activity_new_mention]" value="yes" <?php if ( !get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_mention', true ) || 'yes' == get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_mention', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="no"><input type="radio" name="notifications[notification_activity_new_mention]" value="no" <?php if ( 'no' == get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_mention', true ) ) { ?>checked="checked" <?php } ?>/></td>
                         </tr>
                         <tr>
                                 <td></td>
                                 <td><?php printf( __( "A member replies to an update or comment you've posted", 'buddypress' ), $current_user->user_login ) ?></td>
-                                <td class="yes"><input type="radio" name="notifications[notification_activity_new_reply]" value="yes" <?php if ( !get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_reply' ) || 'yes' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_reply' ) ) { ?>checked="checked" <?php } ?>/></td>
-                                <td class="no"><input type="radio" name="notifications[notification_activity_new_reply]" value="no" <?php if ( 'no' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_reply' ) ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="yes"><input type="radio" name="notifications[notification_activity_new_reply]" value="yes" <?php if ( !get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_reply', true ) || 'yes' == get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_reply', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="no"><input type="radio" name="notifications[notification_activity_new_reply]" value="no" <?php if ( 'no' == get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_reply', true ) ) { ?>checked="checked" <?php } ?>/></td>
                         </tr>
 
                         <?php do_action( 'bp_activity_screen_notification_settings' ) ?>
@@ -710 +710 @@
         ) );
 
         /* 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' );
@@ -837 +837 @@
         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 );
@@ -991 +991 @@
 }
 
 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 );
 }
@@ -1010 +1010 @@
                 $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 */
@@ -1021 +1021 @@
         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 );
@@ -1036 +1036 @@
                 $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 ) );
@@ -1049 +1049 @@
                 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 );
 
@@ -1171 +1171 @@
         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 );
 }

bp-themes/bp-default/_inc/ajax.php

@@ -442 +442 @@
         if ( !isset( $_POST['notice_id'] ) ) {
                 echo "-1<div id='message' class='error'><p>" . __('There was a problem closing the notice.', 'buddypress') . '</p></div>';
         } else {
-                $notice_ids = get_usermeta( $userdata->ID, 'closed_notices' );
+                $notice_ids = get_user_meta( $userdata->ID, 'closed_notices', true );
 
                 $notice_ids[] = (int) $_POST['notice_id'];
 
-                update_usermeta( $userdata->ID, 'closed_notices', $notice_ids );
+                update_user_meta( $userdata->ID, 'closed_notices', $notice_ids );
         }
 }
 add_action( 'wp_ajax_messages_close_notice', 'bp_dtheme_ajax_close_notice' );

bp-core/bp-core-signup.php

@@ -424 +424 @@
         if ( apply_filters( 'bp_core_signup_send_activation_key', true ) ) {
                 if ( !bp_core_is_multisite() ) {
                         $activation_key = wp_hash( $user_id );
-                        update_usermeta( $user_id, 'activation_key', $activation_key );
+                        update_user_meta( $user_id, 'activation_key', $activation_key );
                         bp_core_signup_send_validation_email( $user_id, $user_email, $activation_key );
                 }
         }
@@ -487 +487 @@
                 wp_new_user_notification( $user_id );
 
                 /* Remove the activation key meta */
-                delete_usermeta( $user_id, 'activation_key' );
+                delete_user_meta( $user_id, 'activation_key' );
         }
 
         /* Update the user_url and display_name */
         wp_update_user( array( 'ID' => $user_id, 'user_url' => bp_core_get_user_domain( $user_id, sanitize_title( $user_login ), $user_login ), 'display_name' => bp_core_get_user_displayname( $user_id ) ) );
 
         /* Add a last active entry */
-        update_usermeta( $user_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
+        update_user_meta( $user_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
 
         /* Set the password on multisite installs */
         if ( bp_core_is_multisite() && !empty( $user['meta']['password'] ) )
@@ -537 +537 @@
                 return false;
 
         /* Add a last active entry */
-        update_usermeta( $user_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
+        update_user_meta( $user_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
 
         /* 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', true );
+                $lastname = ' ' . get_user_meta( $user_id, 'last_name', true );
                 $name = $firstname . $lastname;
 
                 if ( empty( $name ) || ' ' == $name )
-                        $name = get_usermeta( $user_id, 'nickname' );
+                        $name = get_user_meta( $user_id, 'nickname', true );
 
                 xprofile_set_field_data( 1, $user_id, $name );
         }

bp-core/bp-core-templatetags.php

@@ -1331 +1331 @@
         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', true ), __('active %s ago', 'buddypress') );
 
         if ( $echo )
                 echo apply_filters( 'bp_last_activity', $last_activity );

bp-core/bp-core-classes.php

@@ -50 +50 @@
          * @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 +79 @@
                 $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', true ), __( 'active %s ago', 'buddypress' ) );
         }
 
         function populate_extras() {

bp-core/bp-core-settings.php

@@ -114 +114 @@
 
                 if ( $_POST['notifications'] ) {
                         foreach ( (array)$_POST['notifications'] as $key => $value ) {
-                                update_usermeta( (int)$current_user->id, $key, $value );
+                                update_user_meta( (int)$current_user->id, $key, $value );
                         }
                 }
 

bp-xprofile/bp-xprofile-templatetags.php

@@ -646 +646 @@
         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', 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 ) ) ) );

bp-friends/bp-friends-notifications.php

@@ -5 +5 @@
 
         $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', true ) )
                 return false;
 
         $ud = get_userdata( $friend_id );
@@ -18 +18 @@
 
         // Set up and send the message
         $to = $ud->user_email;
-        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'New friendship request from %s', 'buddypress' ), $initiator_name );
+        $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'New friendship request from %s', 'buddypress' ), $initiator_name );
 
         $message = sprintf( __(
 "%s wants to add you as a friend.
@@ -47 +47 @@
 
         $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', true ) )
                 return false;
 
         $ud = get_userdata( $initiator_id );
@@ -57 +57 @@
 
         // Set up and send the message
         $to = $ud->user_email;
-        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $friend_name );
+        $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $friend_name );
 
         $message = sprintf( __(
 '%s accepted your friend request.

bp-friends/bp-friends-classes.php

@@ -127 +127 @@
                 $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_usermeta( $user_id, 'total_friend_count' ) )
+                if ( !$count && !get_user_meta( $user_id, 'total_friend_count', true ) )
                         return 0;
 
-                update_usermeta( $user_id, 'total_friend_count', (int)$count );
+                update_user_meta( $user_id, 'total_friend_count', (int)$count );
                 return (int)$count;
         }
 

bp-activity/bp-activity-filters.php

@@ -114 +114 @@
                         continue;
 
                 /* Increase the number of new @ mentions for the user */
-                $new_mention_count = (int)get_usermeta( $user_id, 'bp_new_mention_count' );
-                update_usermeta( $user_id, 'bp_new_mention_count', $new_mention_count + 1 );
+                $new_mention_count = (int)get_user_meta( $user_id, 'bp_new_mention_count', true );
+                update_user_meta( $user_id, 'bp_new_mention_count', $new_mention_count + 1 );
 
                 $content = str_replace( "@$username", "<a href='" . bp_core_get_user_domain( bp_core_get_userid( $username ) ) . "' rel='nofollow'>@$username</a>", $content );
         }

bp-activity/bp-activity-notifications.php

@@ -16 +16 @@
                         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', true ) ) {
                         $poster_name = bp_core_get_user_displayname( $poster_user_id );
 
                         $message_link = bp_activity_get_permalink( $activity_id );
@@ -28 +28 @@
                         // Set up and send the message
                         $ud = bp_core_get_core_userdata( $receiver_user_id );
                         $to = $ud->user_email;
-                        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name );
+                        $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( '%s mentioned you in an update', 'buddypress' ), $poster_name );
 
 $message = sprintf( __(
 '%s mentioned you in an update:
@@ -60 +60 @@
 
         $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', 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/';
@@ -71 +71 @@
                 // Set up and send the message
                 $ud = bp_core_get_core_userdata( $original_activity->user_id );
                 $to = $ud->user_email;
-                $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name );
+                $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( '%s replied to one of your updates', 'buddypress' ), $poster_name );
 
 $message = sprintf( __(
 '%s replied to one of your updates:
@@ -102 +102 @@
 
         $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', 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/';
@@ -110 +110 @@
                 // Set up and send the message
                 $ud = bp_core_get_core_userdata( $parent_comment->user_id );
                 $to = $ud->user_email;
-                $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s replied to one of your comments', 'buddypress' ), $poster_name );
+                $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( '%s replied to one of your comments', 'buddypress' ), $poster_name );
 
                 $poster_name = stripslashes( $poster_name );
                 $content = bp_activity_filter_kses( stripslashes( $content ) );

bp-activity/bp-activity-templatetags.php

@@ -25 +25 @@
                 $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', true ) );
 
                 if ( !empty( $include ) ) {
                         /* Fetch specific activity items based on ID's */
@@ -729 +729 @@
                 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', true ) )
                         return false;
 
                 $latest_update = '"' . apply_filters( 'bp_get_activity_latest_update_excerpt', trim( strip_tags( bp_create_excerpt( $update['content'], 40 ) ) ) ) . '"';
@@ -831 +831 @@
         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', true ) );
         }
 
 function bp_send_public_message_link() {

bp-activity/bp-activity-classes.php

@@ -531 +531 @@
         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', true ) )
                         return 0;
 
                 return count( maybe_unserialize( $favorite_activity_entries ) );

bp-messages.php

@@ -249 +249 @@
                         <tr>
                                 <td></td>
                                 <td><?php _e( 'A member sends you a new message', 'buddypress' ) ?></td>
-                                <td class="yes"><input type="radio" name="notifications[notification_messages_new_message]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_messages_new_message' ) || 'yes' == get_usermeta( $current_user->id, 'notification_messages_new_message' ) ) { ?>checked="checked" <?php } ?>/></td>
-                                <td class="no"><input type="radio" name="notifications[notification_messages_new_message]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_messages_new_message' ) ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="yes"><input type="radio" name="notifications[notification_messages_new_message]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_messages_new_message', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_messages_new_message', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="no"><input type="radio" name="notifications[notification_messages_new_message]" value="no" <?php if ( 'no' == get_user_meta( $current_user->id, 'notification_messages_new_message', true ) ) { ?>checked="checked" <?php } ?>/></td>
                         </tr>
                         <tr>
                                 <td></td>
                                 <td><?php _e( 'A new site notice is posted', 'buddypress' ) ?></td>
-                                <td class="yes"><input type="radio" name="notifications[notification_messages_new_notice]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_messages_new_notice' ) || 'yes' == get_usermeta( $current_user->id, 'notification_messages_new_notice' ) ) { ?>checked="checked" <?php } ?>/></td>
-                                <td class="no"><input type="radio" name="notifications[notification_messages_new_notice]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_messages_new_notice' ) ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="yes"><input type="radio" name="notifications[notification_messages_new_notice]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_messages_new_notice', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_messages_new_notice', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="no"><input type="radio" name="notifications[notification_messages_new_notice]" value="no" <?php if ( 'no' == get_user_meta( $current_user->id, 'notification_messages_new_notice', true ) ) { ?>checked="checked" <?php } ?>/></td>
                         </tr>
 
                         <?php do_action( 'messages_screen_notification_settings' ) ?>

bp-forums.php

@@ -527 +527 @@
 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', true );
 
         if ( empty( $bb_cap ) )
                 return $allcaps;

bp-groups.php

@@ -974 +974 @@
                         <tr>
                                 <td></td>
                                 <td><?php _e( 'A member invites you to join a group', 'buddypress' ) ?></td>
-                                <td class="yes"><input type="radio" name="notifications[notification_groups_invite]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_invite') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_invite') ) { ?>checked="checked" <?php } ?>/></td>
-                                <td class="no"><input type="radio" name="notifications[notification_groups_invite]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_invite') ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="yes"><input type="radio" name="notifications[notification_groups_invite]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_groups_invite', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_groups_invite', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="no"><input type="radio" name="notifications[notification_groups_invite]" value="no" <?php if ( 'no' == get_user_meta( $current_user->id, 'notification_groups_invite', true ) ) { ?>checked="checked" <?php } ?>/></td>
                         </tr>
                         <tr>
                                 <td></td>
                                 <td><?php _e( 'Group information is updated', 'buddypress' ) ?></td>
-                                <td class="yes"><input type="radio" name="notifications[notification_groups_group_updated]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_group_updated') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_group_updated') ) { ?>checked="checked" <?php } ?>/></td>
-                                <td class="no"><input type="radio" name="notifications[notification_groups_group_updated]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_group_updated') ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="yes"><input type="radio" name="notifications[notification_groups_group_updated]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_groups_group_updated', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_groups_group_updated', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="no"><input type="radio" name="notifications[notification_groups_group_updated]" value="no" <?php if ( 'no' == get_user_meta( $current_user->id, 'notification_groups_group_updated', true ) ) { ?>checked="checked" <?php } ?>/></td>
                         </tr>
                         <tr>
                                 <td></td>
                                 <td><?php _e( 'You are promoted to a group administrator or moderator', 'buddypress' ) ?></td>
-                                <td class="yes"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_admin_promotion') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_admin_promotion') ) { ?>checked="checked" <?php } ?>/></td>
-                                <td class="no"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_admin_promotion') ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="yes"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_groups_admin_promotion', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_groups_admin_promotion', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="no"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="no" <?php if ( 'no' == get_user_meta( $current_user->id, 'notification_groups_admin_promotion', true ) ) { ?>checked="checked" <?php } ?>/></td>
                         </tr>
                         <tr>
                                 <td></td>
                                 <td><?php _e( 'A member requests to join a private group for which you are an admin', 'buddypress' ) ?></td>
-                                <td class="yes"><input type="radio" name="notifications[notification_groups_membership_request]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_membership_request') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_membership_request') ) { ?>checked="checked" <?php } ?>/></td>
-                                <td class="no"><input type="radio" name="notifications[notification_groups_membership_request]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_membership_request') ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="yes"><input type="radio" name="notifications[notification_groups_membership_request]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_groups_membership_request', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_groups_membership_request', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                                <td class="no"><input type="radio" name="notifications[notification_groups_membership_request]" value="no" <?php if ( 'no' == get_user_meta( $current_user->id, 'notification_groups_membership_request', true ) ) { ?>checked="checked" <?php } ?>/></td>
                         </tr>
 
                         <?php do_action( 'groups_screen_notification_settings' ); ?>
@@ -1687 +1687 @@
         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_user_meta( $user_id, 'total_group_count', (int) get_user_meta( $user_id, 'total_group_count', true ) - 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.
@@ -2337 +2337 @@
         if ( !$member->ban() )
                 return false;
 
-        update_usermeta( $user_id, 'total_group_count', (int)$total_count - 1 );
+        update_user_meta( $user_id, 'total_group_count', (int)$total_count - 1 );
 }
 
 function groups_unban_member( $user_id, $group_id ) {

bp-messages/bp-messages-notifications.php

@@ -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', true ) ) continue;
 
                 $ud = get_userdata( $recipient->user_id );
                 $message_link = bp_core_get_user_domain( $recipient->user_id ) . BP_MESSAGES_SLUG .'/';
@@ -19 +19 @@
 
                 // Set up and send the message
                 $email_to = $ud->user_email;
-                $email_subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), $sender_name );
+                $email_subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), $sender_name );
 
                 $email_content = sprintf( __(
 '%s sent you a new message:

bp-messages/bp-messages-templatetags.php

@@ -272 +272 @@
         function bp_get_message_thread_last_post_date() {
                 global $messages_template;
 
-                return apply_filters( 'bp_get_message_thread_last_post_date', bp_format_time( strtotime( $messages_template->thread->last_message_date ) ) );
+                return apply_filters( 'bp_get_message_thread_last_post_date', bp_format_time( get_date_from_gmt( $messages_template->thread->last_message_date, 'U' ) ) );
         }
 
 function bp_message_thread_avatar() {
@@ -456 +456 @@
         if ( empty( $notice ) )
                 return false;
 
-        $closed_notices = get_usermeta( $userdata->ID, 'closed_notices' );
+        $closed_notices = get_user_meta( $userdata->ID, 'closed_notices', true );
 
         if ( !$closed_notices )
                 $closed_notices = array();

bp-messages/bp-messages-classes.php

@@ -401 +401 @@
                 // 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_usermeta( $bp->loggedin_user->id, 'last_activity', date( 'Y-m-d H:i:s' ) );
+                update_user_meta( $bp->loggedin_user->id, 'last_activity', date( 'Y-m-d H:i:s' ) );
 
                 do_action( 'messages_notice_after_save', $this );
 

bp-forums/bp-forums-bbpress.php

@@ -103 +103 @@
                 /* Set the site admins as the keymasters */
                 $site_admins = get_site_option( 'site_admins', array('admin') );
                 foreach ( (array)$site_admins as $site_admin )
-                        update_usermeta( bp_core_get_userid( $site_admin ), $bb_table_prefix . 'capabilities', array( 'keymaster' => true ) );
+                        update_user_meta( bp_core_get_userid( $site_admin ), $bb_table_prefix . 'capabilities', array( 'keymaster' => true ) );
 
                 // Create the first forum.
                 bb_new_forum( array( 'forum_name' => 'Default Forum' ) );
@@ -130 +130 @@
                 $args = wp_parse_args( $args, $defaults );
                 extract( $args, EXTR_SKIP );
 
-                return update_usermeta( $id, $meta_key, $meta_value );
+                return update_user_meta( $id, $meta_key, $meta_value );
         }
 }
 

bp-core.php

@@ -556 +556 @@
  * @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;
@@ -1475 +1475 @@
  *
  * @package BuddyPress Core
  * @global $userdata WordPress user data for the current logged in user.
- * @uses update_usermeta() WordPress function to update user metadata in the usermeta table.
+ * @uses update_user_meta() WordPress function to update user metadata in the usermeta table.
  */
 function bp_core_record_activity() {
         global $bp;
@@ -1483 +1483 @@
         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', true );
 
         if ( !is_numeric( $activity ) )
                 $activity = strtotime( $activity );
 
         if ( '' == $activity || strtotime( gmdate( "Y-m-d H:i:s" ) ) >= strtotime( '+5 minutes', $activity ) )
-                update_usermeta( $bp->loggedin_user->id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
+                update_user_meta( $bp->loggedin_user->id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
 }
 add_action( 'wp_head', 'bp_core_record_activity' );
 
@@ -1926 +1926 @@
  *
  * @package BuddyPress Core
  * @param $user_id The user id for the user to delete usermeta for
- * @uses delete_usermeta() deletes a row from the wp_usermeta table based on meta_key
+ * @uses 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_usermeta( $user_id, 'last_activity' );
+        delete_user_meta( $user_id, 'last_activity' );
 
         /* Flush the cache to remove the user from all cached objects */
         wp_cache_flush();

bp-xprofile.php

@@ -908 +908 @@
                 $lastname = trim( substr( $fullname, $space, strlen($fullname) ) );
         }
 
-        update_usermeta( $user_id, 'nickname', $fullname );
-        update_usermeta( $user_id, 'first_name', $firstname );
-        update_usermeta( $user_id, 'last_name', $lastname );
+        update_user_meta( $user_id, 'nickname', $fullname );
+        update_user_meta( $user_id, 'first_name', $firstname );
+        update_user_meta( $user_id, 'last_name', $lastname );
 
         $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET display_name = %s WHERE ID = %d", $fullname, $user_id ) );
         $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET user_url = %s WHERE ID = %d", bp_core_get_user_domain( $user_id ), $user_id ) );
@@ -962 +962 @@
  *
  * @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 delete_usermeta() Delete 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_user_meta() 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
  */
 function xprofile_remove_data( $user_id ) {
         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', true ) );
+        @unlink( get_user_meta( $user_id, 'bp_core_avatar_v2_path', true ) );
 
         // unset the usermeta for avatars from the usermeta table.
-        delete_usermeta( $user_id, 'bp_core_avatar_v1' );
-        delete_usermeta( $user_id, 'bp_core_avatar_v1_path' );
-        delete_usermeta( $user_id, 'bp_core_avatar_v2' );
-        delete_usermeta( $user_id, 'bp_core_avatar_v2_path' );
+        delete_user_meta( $user_id, 'bp_core_avatar_v1' );
+        delete_user_meta( $user_id, 'bp_core_avatar_v1_path' );
+        delete_user_meta( $user_id, 'bp_core_avatar_v2' );
+        delete_user_meta( $user_id, 'bp_core_avatar_v2_path' );
 }
 add_action( 'wpmu_delete_user', 'xprofile_remove_data' );
 add_action( 'delete_user', 'xprofile_remove_data' );

bp-groups/bp-groups-classes.php

@@ -748 +748 @@
 
                 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', true );
                 if ( !empty( $group_count ) )
-                        update_usermeta( $this->user_id, 'total_group_count', (int)$group_count - 1 );
+                        update_user_meta( $this->user_id, 'total_group_count', (int)$group_count - 1 );
 
                 return $this->save();
         }
@@ -762 +762 @@
                 $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_user_meta( $this->user_id, 'total_group_count', (int)get_user_meta( $this->user_id, 'total_group_count', true ) + 1 );
 
                 return $this->save();
         }

bp-groups/bp-groups-notifications.php

@@ -4 +4 @@
         global $bp;
 
         $group = new BP_Groups_Group( $group_id );
-        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . __( 'Group Details Updated', 'buddypress' );
+        $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . __( 'Group Details Updated', 'buddypress' );
 
         $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', true ) ) continue;
 
                 $ud = bp_core_get_core_userdata( $user_id );
 
@@ -44 +44 @@
 
         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', true ) )
                 return false;
 
         $requesting_user_name = bp_core_get_user_displayname( $requesting_user_id );
@@ -59 +59 @@
 
         // Set up and send the message
         $to = $ud->user_email;
-        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name );
+        $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'Membership request for group: %s', 'buddypress' ), $group->name );
 
 $message = sprintf( __(
 '%s wants to join the group "%s".
@@ -93 +93 @@
         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', true ) )
                 return false;
 
         $group = new BP_Groups_Group( $group_id );
@@ -107 +107 @@
         $to = $ud->user_email;
 
         if ( $accepted ) {
-                $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name );
+                $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'Membership request for group "%s" accepted', 'buddypress' ), $group->name );
                 $message = sprintf( __(
 'Your membership request for the group "%s" has been accepted.
 
@@ -117 +117 @@
 ', 'buddypress' ), $group->name, $group_link );
 
         } else {
-                $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name );
+                $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'Membership request for group "%s" rejected', 'buddypress' ), $group->name );
                 $message = sprintf( __(
 'Your membership request for the group "%s" has been rejected.
 
@@ -151 +151 @@
         // 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', true ) )
                 return false;
 
         $group = new BP_Groups_Group( $group_id );
@@ -163 +163 @@
         // Set up and send the message
         $to = $ud->user_email;
 
-        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name );
+        $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'You have been promoted in the group: "%s"', 'buddypress' ), $group->name );
 
         $message = sprintf( __(
 'You have been promoted to %s for the group: "%s".
@@ -199 +199 @@
                 // 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', true ) )
                         return false;
 
                 $invited_ud = bp_core_get_core_userdata($invited_user_id);
@@ -211 +211 @@
                 // Set up and send the message
                 $to = $invited_ud->user_email;
 
-                $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name );
+                $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( 'You have an invitation to the group: "%s"', 'buddypress' ), $group->name );
 
                 $message = sprintf( __(
 'One of your friends %s has invited you to the group: "%s".
@@ -258 +258 @@
                         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', true ) ) {
                         $poster_name = bp_core_get_user_displayname( $poster_user_id );
 
                         $message_link = bp_activity_get_permalink( $activity_id );
@@ -270 +270 @@
                         // Set up and send the message
                         $ud = bp_core_get_core_userdata( $receiver_user_id );
                         $to = $ud->user_email;
-                        $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( '%s mentioned you in the group "%s"', 'buddypress' ), $poster_name, $group->name );
+                        $subject = '[' . wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ) ) . '] ' . sprintf( __( '%s mentioned you in the group "%s"', 'buddypress' ), $poster_name, $group->name );
 
 $message = sprintf( __(
 '%s mentioned you in the group "%s":