Changeset 13243 for trunk/src/bp-notifications/classes/class-bp-notifications-notification.php

Timestamp:

02/22/2022 06:54:08 PM (3 years ago)

Author:

imath

Message:

Clear the notifications user cache when bulk updating/deleting items

This commit also groups PHP Unit tests about notifications cache functions into a specific file.

Props niftythree, oztaser.

See #8637 (trunk)

File:

• trunk/src/bp-notifications/classes/class-bp-notifications-notification.php (modified) (3 diffs)

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

@@ -934 +934 @@
         $conditions[] = "{$field} IN ({$_items})";
 
-        foreach ( $update_args['data'] as $field => $value ) {
-            $index  = array_search( $field, array_keys( $update_args['data'] ) );
+        foreach ( $update_args['data'] as $update_field => $value ) {
+            $index  = array_search( $update_field, array_keys( $update_args['data'] ) );
             $format = $update_args['format'][ $index ];
 
-            $fields[] = "{$field} = {$format}";
+            $fields[] = "{$update_field} = {$format}";
             $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;
         }
@@ -952 +952 @@
         $fields     = implode( ', ', $fields );
         $conditions = implode( ' AND ', $conditions );
+
+        if ( 'item_id' === $field && isset( $where_args['data']['user_id'] ) ) {
+            $where_args['item_ids'] = $items;
+            $where_args['user_id']  = $where_args['data']['user_id'];
+        } elseif ( 'id' === $field ) {
+            $where_args['ids'] = $items;
+        }
 
         /** This action is documented in bp-notifications/classes/class-bp-notifications-notification.php */
@@ -1022 +1029 @@
         $conditions[] = "{$field} IN ({$_items})";
 
-        foreach ( $where['data'] as $field => $value ) {
-            $index  = array_search( $field, array_keys( $where['data'] ) );
+        foreach ( $where['data'] as $where_field => $value ) {
+            $index  = array_search( $where_field, array_keys( $where['data'] ) );
             $format = $where['format'][ $index ];
 
-            $conditions[] = "{$field} = {$format}";
+            $conditions[] = "{$where_field} = {$format}";
             $values[]     = $value;
         }
 
         $conditions = implode( ' AND ', $conditions );
+
+        if ( 'id' === $field ) {
+            $args['id'] = $items;
+        }
 
         /** This action is documented in bp-notifications/classes/class-bp-notifications-notification.php */