Changeset 2077 for trunk/bp-messages/bp-messages-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-messages/bp-messages-notifications.php (modified) (5 diffs)

trunk/bp-messages/bp-messages-notifications.php

@@ -4 +4 @@
         global $bp;
         extract($args);
-        
+
         $message = new BP_Messages_Message( $item_id );
-        
+
         $sender_name = bp_core_get_user_displayname( $message->sender_id );
 
@@ -13 +13 @@
 
                 $ud = get_userdata( $recipient_ids[$i] );
-                $message_link = bp_core_get_user_domain( $recipient_ids[$i] ) . 'messages/view/' . $message->id; 
-                $settings_link = bp_core_get_user_domain( $recipient_ids[$i] ) . 'settings/notifications'; 
-                
+                $message_link = bp_core_get_user_domain( $recipient_ids[$i] ) . 'messages/view/' . $message->id;
+                $settings_link = bp_core_get_user_domain( $recipient_ids[$i] ) . 'settings/notifications';
+
                 // Set up and send the message
                 $to = $ud->user_email;
                 $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'New message from %s', 'buddypress' ), stripslashes( $sender_name ) );
 
-                $content = sprintf( __( 
+                $content = sprintf( __(
 '%s sent you a new message:
 
@@ -45 +45 @@
 
         $users = $wpdb->get_results( $wpdb->prepare( "SELECT ID as user_id, user_email, user_login FROM {$wpdb->base_prefix}users WHERE user_status = 0 AND spam = 0 AND deleted = 0" ) );
-        
+
         for ( $i = 0; $i < count($users); $i++ ) {
                 if ( get_usermeta( $users[$i]->user_id, 'notification_messages_new_notice' ) == 'no' ) continue;
 
-                $message_link = bp_core_get_user_domain( $users[$i]->user_id ) . 'messages'; 
-                $settings_link = bp_core_get_user_domain( $users[$i]->user_id ) . 'settings/notifications'; 
+                $message_link = bp_core_get_user_domain( $users[$i]->user_id ) . 'messages';
+                $settings_link = bp_core_get_user_domain( $users[$i]->user_id ) . 'settings/notifications';
 
                 // Set up and send the message
@@ -56 +56 @@
                 $subject = __( 'New Site Notice', 'buddypress' );
 
-                $message = sprintf( __( 
+                $message = sprintf( __(
 'A new site notice has been posted on %s:
 
@@ -70 +70 @@
                 // Send it
                 wp_mail( $to, $subject, $message );
-                
+
                 unset($message);
                 unset($subject);