Changeset 13155

Timestamp:

11/20/2021 10:03:44 PM (5 years ago)

Author:

imath

Message:

Get the right user latest new_avatar activity before replacing it

In [13154] we missed setting the filter key of the array argument passed to the bp_activity_get() function.

See #8581

Location:

trunk

Files:

• src/bp-members/bp-members-activity.php (modified) (2 diffs)
• tests/phpunit/testcases/members/activity.php (modified) (4 diffs)

trunk/src/bp-members/bp-members-activity.php

@@ -193 +193 @@
         $user_id = apply_filters( 'bp_members_new_avatar_user_id', $user_id );
 
+        // Get the BuddyPress main plugin instance.
+        $bp = buddypress();
+
         // Check to make sure that a user has just one `new_avatar` activity per throttle time.
         $last_new_avatar_activity = bp_activity_get(
                 array(
-                        'user_id'   => $user_id,
-                        'component' => buddypress()->members->id,
-                        'type'      => 'new_avatar',
                         'per_page'  => 1,
+                        'filter'    => array(
+                                'object'  => $bp->members->id,
+                                'user_id' => $user_id,
+                                'action'  => 'new_avatar',
+                        )
                 )
         );
@@ -230 +235 @@
                 array(
                         'user_id'   => $user_id,
-                        'component' => buddypress()->members->id,
+                        'component' => $bp->members->id,
                         'type'      => 'new_avatar',
                 )

trunk/tests/phpunit/testcases/members/activity.php

@@ -101 +101 @@
                 $u = self::factory()->user->create();
                 $a = self::factory()->activity->create( array(
-                        'component' => 'members',
+                        'component' => buddypress()->members->id,
                         'type'      => 'new_avatar',
                         'user_id'   => $u,
@@ -109 +109 @@
 
                 $new_avatar_activities = bp_activity_get( array(
-                        'user_id'     => $u,
-                        'component'   => buddypress()->members->id,
-                        'type'        => 'new_avatar',
+                        'filter'    => array(
+                                'object'  => buddypress()->members->id,
+                                'user_id' => $u,
+                                'action'  => 'new_avatar',
+                        ),
                         'count_total' => 'count_query',
                 ) );
@@ -129 +131 @@
 
                 $a = self::factory()->activity->create( array(
-                        'component'     => 'members',
+                        'component'     => buddypress()->members->id,
                         'type'          => 'new_avatar',
                         'user_id'       => $u,
@@ -138 +140 @@
 
                 $new_avatar_activities = bp_activity_get( array(
-                        'user_id'     => $u,
-                        'component'   => buddypress()->members->id,
-                        'type'        => 'new_avatar',
+                        'filter'    => array(
+                                'object'  => buddypress()->members->id,
+                                'user_id' => $u,
+                                'action'  => 'new_avatar',
+                        ),
                         'count_total' => 'count_query',
                 ) );