Changeset 3300 for trunk/bp-friends/bp-friends-notifications.php

Timestamp:

10/24/2010 09:22:29 PM (16 years ago)

Author:

djpaul

Message:

Fixed #2676

File:

• trunk/bp-friends/bp-friends-notifications.php (modified) (4 diffs)

trunk/bp-friends/bp-friends-notifications.php

@@ -6 +6 @@
         $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;
 
@@ -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 );
+        $to       = $ud->user_email;
+        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
+        $subject  = '[' . $sitename . '] ' . sprintf( __( 'New friendship request from %s', 'buddypress' ), $initiator_name );
 
         $message = sprintf( __(
@@ -48 +49 @@
         $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;
 
@@ -57 +58 @@
 
         // 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 );
+        $to       = $ud->user_email;
+        $sitename = wp_specialchars_decode( get_blog_option( BP_ROOT_BLOG, 'blogname' ), ENT_QUOTES );
+        $subject  = '[' . $sitename . '] ' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $friend_name );
 
         $message = sprintf( __(