Changeset 7537 for trunk/bp-notifications/bp-notifications-functions.php

Timestamp:

11/08/2013 07:53:56 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Use the correct function and update methods for marking user notifications as read. See #5148.

File:

• trunk/bp-notifications/bp-notifications-functions.php (modified) (4 diffs)

trunk/bp-notifications/bp-notifications-functions.php

@@ -307 +307 @@
  */
 function bp_notifications_mark_notifications_by_type( $user_id, $component_name, $component_action, $is_new = false ) {
-    return BP_Notifications_Notification::delete( array(
-        'user_id'          => $user_id,
-        'component_name'   => $component_name,
-        'component_action' => $component_action,
-        'is_new'           => $is_new,
-    ) );
+    return BP_Notifications_Notification::update(
+        array(
+            'is_new' => $is_new
+        ),
+        array(
+            'user_id'          => $user_id,
+            'component_name'   => $component_name,
+            'component_action' => $component_action
+        )
+    );
 }
 
@@ -332 +336 @@
  */
 function bp_notifications_mark_notifications_by_item_id( $user_id, $item_id, $component_name, $component_action, $secondary_item_id = false, $is_new = false ) {
-    return BP_Notifications_Notification::delete( array(
-        'user_id'           => $user_id,
-        'item_id'           => $item_id,
-        'secondary_item_id' => $secondary_item_id,
-        'component_name'    => $component_name,
-        'component_action'  => $component_action,
-        'is_new'            => $is_new,
-    ) );
+    return BP_Notifications_Notification::update(
+        array(
+            'is_new' => $is_new
+        ),
+        array(
+            'user_id'           => $user_id,
+            'item_id'           => $item_id,
+            'secondary_item_id' => $secondary_item_id,
+            'component_name'    => $component_name,
+            'component_action'  => $component_action
+        )
+    );
 }
 
@@ -358 +366 @@
  */
 function bp_notifications_mark_all_notifications_by_type( $item_id, $component_name, $component_action = false, $secondary_item_id = false, $is_new = false ) {
-    return BP_Notifications_Notification::delete( array(
-        'item_id'           => $item_id,
-        'secondary_item_id' => $secondary_item_id,
-        'component_name'    => $component_name,
-        'component_action'  => $component_action,
-        'is_new'            => $is_new,
-    ) );
+    return BP_Notifications_Notification::update(
+        array(
+            'is_new' => $is_new
+        ),
+        array(
+            'item_id'           => $item_id,
+            'secondary_item_id' => $secondary_item_id,
+            'component_name'    => $component_name,
+            'component_action'  => $component_action
+        )
+    );
 }
 
@@ -386 +398 @@
  */
 function bp_notifications_mark_notifications_from_user( $user_id, $component_name, $component_action, $is_new = false ) {
-    return BP_Notifications_Notification::delete( array(
-        'item_id'          => $user_id,
-        'component_name'   => $component_name,
-        'component_action' => $component_action,
-        'is_new'           => $is_new,
-    ) );
+    return BP_Notifications_Notification::_update(
+        array(
+            'is_new' => $is_new
+        ),
+        array(
+            'item_id'          => $user_id,
+            'component_name'   => $component_name,
+            'component_action' => $component_action
+        )
+    );
 }