Changeset 7527

Timestamp:

11/08/2013 04:40:26 AM (13 years ago)

Author:

johnjamesjacoby

Message:

In Messages component, add sender_id to secondary_item_id in notifications. Will be used to include the username in notifications. See #5148.

File:

• trunk/bp-messages/bp-messages-functions.php (modified) (2 diffs)

trunk/bp-messages/bp-messages-functions.php

@@ -117 +117 @@
 
                 // Send screen notifications to the recipients
-                foreach ( (array) $message->recipients as $recipient )
-                        bp_core_add_notification( $message->id, $recipient->user_id, 'messages', 'new_message' );
+                foreach ( (array) $message->recipients as $recipient ) {
+                        bp_core_add_notification( $message->id, $recipient->user_id, 'messages', 'new_message', $message->sender_id );
+                }
 
                 // Send email notifications to the recipients
@@ -242 +243 @@
 
                 if ( (int) $total_items > 1 ) {
-                        $text = sprintf( __('You have %d new messages', 'buddypress' ), (int) $total_items );
+                        $text   = sprintf( __('You have %d new messages', 'buddypress' ), (int) $total_items );
                         $filter = 'bp_messages_multiple_new_message_notification';
                 } else {
-                        $text = sprintf( __('You have %d new message', 'buddypress' ), (int) $total_items );
+                        if ( !empty( $secondary_item_id ) ) {
+                                $text = sprintf( __('You have %d new message from %s', 'buddypress' ), (int) $total_items, bp_core_get_user_displayname( $secondary_item_id ) );
+                        } else {
+                                $text = sprintf( __('You have %d new message',         'buddypress' ), (int) $total_items );
+                        }
                         $filter = 'bp_messages_single_new_message_notification';
                 }