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

Timestamp:

11/02/2009 07:54:21 PM (17 years ago)

Author:

apeatling

Message:

Merging 1.1 branch changes and syncing.

File:

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

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

@@ -3 +3 @@
 function friends_notification_new_request( $friendship_id, $initiator_id, $friend_id ) {
         global $bp;
-        
+
         $initiator_name = bp_core_get_user_displayname( $initiator_id );
 
         if ( 'no' == get_usermeta( (int)$friend_id, 'notification_friends_friendship_request' ) )
                 return false;
-        
+
         $ud = get_userdata( $friend_id );
         $initiator_ud = get_userdata( $initiator_id );
-        
+
         $all_requests_link = bp_core_get_user_domain( $friend_id ) . 'friends/requests/';
         $settings_link = bp_core_get_user_domain( $friend_id ) . 'settings/notifications';
-        
+
         $initiator_link = bp_core_get_user_domain( $initiator_id );
 
@@ -21 +21 @@
         $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'New friendship request from %s', 'buddypress' ), $initiator_name );
 
-        $message = sprintf( __( 
+        $message = sprintf( __(
 "%s wants to add you as a friend.
 
@@ -40 +40 @@
 function friends_notification_accepted_request( $friendship_id, $initiator_id, $friend_id ) {
         global $bp;
-        
+
         $friendship = new BP_Friends_Friendship( $friendship_id, false, false );
-        
+
         $friend_name = bp_core_get_user_displayname( $friend_id );
 
         if ( 'no' == get_usermeta( (int)$initiator_id, 'notification_friends_friendship_accepted' ) )
                 return false;
-        
+
         $ud = get_userdata( $initiator_id );
-        
+
         $friend_link = bp_core_get_user_domain( $friend_id );
-        $settings_link = bp_core_get_user_domain( $initiator_id ) . 'settings/notifications'; 
-                
+        $settings_link = bp_core_get_user_domain( $initiator_id ) . 'settings/notifications';
+
         // 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 );
 
-        $message = sprintf( __( 
+        $message = sprintf( __(
 '%s accepted your friend request.