Ticket #5970: bp-messages-notifications-5970.diff

src/bp-messages/bp-messages-notifications.php

@@ -125 +125 @@
         $total_items = (int) $total_items;
         $link        = trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() . '/inbox' );
         $title       = __( 'Inbox', 'buddypress' );
+        $amount      = 'single';
 
         if ( 'new_message' === $action ) {
                 if ( $total_items > 1 ) {
                         $text   = sprintf( __( 'You have %d new messages', 'buddypress' ), $total_items );
-                        $filter = 'bp_messages_multiple_new_message_notification';
+                        $amount = 'multiple';
                 } else {
                         // get message thread ID
                         $message   = new BP_Messages_Message( $item_id );
@@ -143 +144 @@
                         } else {
                                 $text = sprintf( _n( 'You have %s new private message', 'You have %s new private messages', $total_items, 'buddypress' ), bp_core_number_format( $total_items ) );
                         }
-                        $filter = 'bp_messages_single_new_message_notification';
                 }
         }
 
@@ -153 +153 @@
                 } else {
                         $retval = esc_html( $text );
                 }
-                $return = apply_filters( $filter, $retval, (int) $total_items, $text, $link, $item_id, $secondary_item_id );
+                $return = apply_filters( 'bp_messages_' . $amount . '_new_message_notification', $retval, (int) $total_items, $text, $link, $item_id, $secondary_item_id );
         } else {
-                $return = apply_filters( $filter, array(
+                $return = apply_filters( 'bp_messages_' . $amount . '_new_message_notification', array(
                         'text' => $text,
                         'link' => $link
                 ), $link, (int) $total_items, $text, $link, $item_id, $secondary_item_id );