Ticket #7066: 7066.01.patch

src/bp-notifications/bp-notifications-functions.php

@@ -233 +233 @@
                                                 $component_action_items[0]->item_id,
                                                 $component_action_items[0]->secondary_item_id,
                                                 $action_item_count,
-                                                'array'
+                                                'array',
+                                                $component_action_items[0]->id
                                         );
 
                                         // Create the object to be returned.
@@ -253 +254 @@
 
                                 // Return an array of content strings.
                                 } else {
-                                        $content      = call_user_func( $bp->{$component_name}->notification_callback, $component_action_name, $component_action_items[0]->item_id, $component_action_items[0]->secondary_item_id, $action_item_count );
+                                        $content      = call_user_func( $bp->{$component_name}->notification_callback, $component_action_name, $component_action_items[0]->item_id, $component_action_items[0]->secondary_item_id, $action_item_count, $component_action_items[0]->id );
                                         $renderable[] = $content;
                                 }
 
@@ -272 +273 @@
                                         $action_item_count,
                                         $format,
                                         $component_action_name, // Duplicated so plugins can check the canonical action name.
-                                        $component_name
+                                        $component_name,
+                                        $component_action_items[0]->id
                                 );
 
                                 // Function should return an object.
@@ -296 +298 @@
                                          * @param string $format                Format of return. Either 'string' or 'object'.
                                          * @param string $component_action_name Canonical notification action.
                                          * @param string $component_name        Notification component ID.
+                                         * @param int    $id                    Notification ID.
                                          *
                                          * @return string|array If $format is 'string', return a string of the notification content.
                                          *                      If $format is 'object', return an array formatted like:

src/bp-notifications/bp-notifications-template.php

@@ -469 +469 @@
 
                 // Callback function exists.
                 if ( isset( $bp->{ $notification->component_name }->notification_callback ) && is_callable( $bp->{ $notification->component_name }->notification_callback ) ) {
-                        $description = call_user_func( $bp->{ $notification->component_name }->notification_callback, $notification->component_action, $notification->item_id, $notification->secondary_item_id, 1 );
+                        $description = call_user_func( $bp->{ $notification->component_name }->notification_callback, $notification->component_action, $notification->item_id, $notification->secondary_item_id, 1, 'string', $notification->id );
 
                 // @deprecated format_notification_function - 1.5
                 } elseif ( isset( $bp->{ $notification->component_name }->format_notification_function ) && function_exists( $bp->{ $notification->component_name }->format_notification_function ) ) {
@@ -479 +479 @@
                 } else {
 
                         /** This filter is documented in bp-notifications/bp-notifications-functions.php */
-                        $description = apply_filters_ref_array( 'bp_notifications_get_notifications_for_user', array( $notification->component_action, $notification->item_id, $notification->secondary_item_id, 1, 'string', $notification->component_action, $notification->component_name ) );
+                        $description = apply_filters_ref_array( 'bp_notifications_get_notifications_for_user', array( $notification->component_action, $notification->item_id, $notification->secondary_item_id, 1, 'string', $notification->component_action, $notification->component_name, $notification->id ) );
                 }
 
                 /**