Ticket #8135: 8135.patch

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

@@ -197 +197 @@
                  *
                  * @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;
         }
@@ -614 +614 @@
          *
          * @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
          */
@@ -628 +628 @@
                 $fetch = array();
                 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;
                         }
@@ -649 +649 @@
                         if ( 1 === (int) $friendship->is_confirmed ) {
                                 $status_initiator = $status_friend = 'is_friend';
                         } else {
-                                $status_initiator = 'pending'; 
+                                $status_initiator = 'pending';
                                 $status_friend    = 'awaiting_response';
                         }
                         bp_core_set_incremented_cache( $initiator_user_id . ':' . $friend_user_id, 'bp_friends', $status_initiator );

tests/phpunit/testcases/members/template.php

@@ -27 +27 @@
         /**
          * @ticket BP5898
          * @group bp_has_members
+         * @group imath
          */
         public function test_bp_has_members_search_pagination_with_spaces() {
                 $u1 = self::factory()->user->create( array( 'display_name' => '~ tilde u1' ) );
@@ -42 +43 @@
 
                 bp_has_members( $template_args );
 
-                preg_match( '/&members_search=(.*)\'/', $members_template->pag_links, $matches );
+                preg_match( '/&members_search=(.*)(\'|\")/', $members_template->pag_links, $matches );
 
                 $this->assertEquals( urldecode( $matches[1] ), urldecode( $template_args['search_terms'] ) );