Changeset 5595

Timestamp:

12/24/2011 03:37:55 PM (13 years ago)

Author:

boonebgorges

Message:

Don't send at-message notifications more than once for the same activity item. Fixes #3825

Location:

trunk

Files:

• bp-activity/bp-activity-notifications.php (modified) (1 diff)
• bp-core/bp-core-classes.php (modified) (1 diff)

trunk/bp-activity/bp-activity-notifications.php

@@ -41 +41 @@
 function bp_activity_at_message_notification( $activity_id, $receiver_user_id ) {
     global $bp;
+    
+    // Don't leave multiple notifications for the same activity item
+    $notifications = BP_Core_Notification::get_all_for_user( $receiver_user_id, 'all' );
+    
+    foreach( $notifications as $notification ) {
+        if ( $activity_id == $notification->item_id ) {
+            return;
+        }
+    }
 
     $activity = new BP_Activity_Activity( $activity_id );

trunk/bp-core/bp-core-classes.php

@@ -746 +746 @@
      * @global wpdb $wpdb WordPress database object
      * @param integer $user_id User ID
+     * @param str $status 'is_new' or 'all'
      * @return array Associative array
      * @static
      */
-    function get_all_for_user( $user_id ) {
+    function get_all_for_user( $user_id, $status = 'is_new' ) {
         global $bp, $wpdb;
 
-        return $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->core->table_name_notifications} WHERE user_id = %d AND is_new = 1", $user_id ) );
+        $is_new = 'is_new' == $status ? ' AND is_new = 1 ' : '';
+
+        return $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->core->table_name_notifications} WHERE user_id = %d {$is_new}", $user_id ) );
     }