Changeset 12459 for trunk/src/bp-friends/classes/class-bp-friends-friendship.php

Timestamp:

09/16/2019 09:52:45 PM (5 years ago)

Author:

imath

Message:

Fix failing tests under WordPress trunk (5.3)

1. Use do_action_ref_array() instead of do_action() to pass the BP_Friends_Friendship object by reference.
2. Adapts the test_bp_has_members_search_pagination_with_spaces() test to WordPress changes in the paginate_links() function.

Fixes #8135

File:

• trunk/src/bp-friends/classes/class-bp-friends-friendship.php (modified) (4 diffs)

trunk/src/bp-friends/classes/class-bp-friends-friendship.php

@@ -198 +198 @@
          * @param BP_Friends_Friendship $value Current friendship request object.
          */
-        do_action( 'friends_friendship_after_save', array( &$this ) );
+        do_action_ref_array( 'friends_friendship_after_save', array( &$this ) );
 
         return $result;
@@ -615 +615 @@
      * @since 3.0.0
      *
-     * @param int $user_id                          The ID of the primary user for whom we want 
+     * @param int $user_id                          The ID of the primary user for whom we want
      *                                              to check friendships statuses.
-     * @param int|array|string $possible_friend_ids The IDs of the one or more users 
+     * @param int|array|string $possible_friend_ids The IDs of the one or more users
      *                                              to check friendship status with primary user.
      * @return null
@@ -629 +629 @@
         foreach ( $possible_friend_ids as $friend_id ) {
             // Check for cached items in both friendship directions.
-            if ( false === bp_core_get_incremented_cache( $user_id . ':' . $friend_id, 'bp_friends' ) 
+            if ( false === bp_core_get_incremented_cache( $user_id . ':' . $friend_id, 'bp_friends' )
                 || false === bp_core_get_incremented_cache( $friend_id . ':' . $user_id, 'bp_friends' ) ) {
                 $fetch[] = $friend_id;
@@ -650 +650 @@
                 $status_initiator = $status_friend = 'is_friend';
             } else {
-                $status_initiator = 'pending'; 
+                $status_initiator = 'pending';
                 $status_friend    = 'awaiting_response';
             }