Ticket #8637: 8637.diff

src/bp-notifications/bp-notifications-cache.php

@@ -104 +104 @@
         }
 }
 add_action( 'bp_notification_before_update', 'bp_notifications_clear_all_for_user_cache_before_update', 10, 2 );
+
+/**
+ * Invalidate the 'all_for_user_' cache when deleting notifications by id list.
+ *
+ * @since 10.1.0
+ *
+ * @param string $field The name of the db field of the items to delete.
+ *                      Possible values are `id` or `item_id`.
+ * @param int[]  $items The list of items to delete.
+ * @param array  $args  The WHERE arguments to use to specify the item IDs to delete.
+ */
+function bp_notifications_clear_all_for_user_cache_before_delete_by_id_list( $field, $items, $args ) {
+        $args[ $field ] = $items;
+
+        $notifications = BP_Notifications_Notification::get( $args );
+        $user_ids      = wp_parse_id_list( wp_list_pluck( $notifications, 'user_id' ) );
+
+        foreach ( $user_ids as $user_id ) {
+                bp_notifications_clear_all_for_user_cache( $user_id );
+        }
+}
+add_action( 'bp_notification_before_delete_by_id_list', 'bp_notifications_clear_all_for_user_cache_before_delete_by_id_list', 10, 3 );
+
+/**
+ * Invalidate the 'all_for_user_' cache when updating notifications by id list.
+ *
+ * @since 10.1.0
+ *
+ * @param string $field The name of the db field of the items to update.
+ *                      Possible values are `id` or `item_id`.
+ * @param int[]  $items The list of items to update.
+ * @param array  $data  Array of notification data to update.
+ * @param array  $where The WHERE params to use to specify the item IDs to update.
+ */
+function bp_notifications_clear_all_for_user_cache_before_update_id_list( $field, $items, $data, $where ) {
+        $where[ $field ] = $items;
+
+        $notifications = BP_Notifications_Notification::get( $where );
+        $user_ids      = wp_parse_id_list( wp_list_pluck( $notifications, 'user_id' ) );
+
+        foreach ( $user_ids as $user_id ) {
+                bp_notifications_clear_all_for_user_cache( $user_id );
+        }
+}
+add_action( 'bp_notification_before_update_id_list', 'bp_notifications_clear_all_for_user_cache_before_update_id_list', 10, 4 );

src/bp-notifications/classes/class-bp-notifications-notification.php

@@ -941 +941 @@
                         $values[] = $value;
                 }
 
-                foreach ( $where_args['data'] as $field => $value ) {
-                        $index  = array_search( $field, array_keys( $where_args['data'] ) );
+                foreach ( $where_args['data'] as $where_field => $value ) {
+                        $index  = array_search( $where_field, array_keys( $where_args['data'] ) );
                         $format = $where_args['format'][ $index ];
 
-                        $conditions[] = "{$field} = {$format}";
+                        $conditions[] = "{$where_field} = {$format}";
                         $values[]     = $value;
                 }
 
@@ -955 +955 @@
                 /** This action is documented in bp-notifications/classes/class-bp-notifications-notification.php */
                 do_action( 'bp_notification_before_update', $update_args, $where_args );
 
+                /** This action is documented in bp-notifications/classes/class-bp-notifications-notification.php */
+                do_action( 'bp_notification_before_update_id_list', $field, $items, $data, $where, $update_args, $where_args );
+
                 return $wpdb->query( $wpdb->prepare( "UPDATE {$bp->notifications->table_name} SET {$fields} WHERE {$conditions}", $values ) );
         }
 
@@ -1034 +1037 @@
                 /** This action is documented in bp-notifications/classes/class-bp-notifications-notification.php */
                 do_action( 'bp_notification_before_delete', $args );
 
+                /** This action is documented in bp-notifications/classes/class-bp-notifications-notification.php */
+                do_action( 'bp_notification_before_delete_by_id_list', $field, $items, $args );
+
                 if ( ! $values ) {
                         return $wpdb->query( "DELETE FROM {$bp->notifications->table_name} WHERE {$conditions}" );
                 }