Changeset 8173

Timestamp:

03/27/2014 05:37:41 PM (12 years ago)

Author:

boonebgorges

Message:

Fix check for existing friendship in friends_add_friend()

The previous logic would always result in this check failing.

Fixes #5319

Props r-a-y

Location:

trunk

Files:

• bp-friends/bp-friends-functions.php (modified) (2 diffs)
• tests/testcases/friends/functions.php (modified) (1 diff)

trunk/bp-friends/bp-friends-functions.php

@@ -37 +37 @@
 
         // Check if already friends, and bail if so
+        if ( friends_check_friendship( $initiator_userid, $friend_userid ) ) {
+                return true;
+        }
+
+        // Setup the friendship data
         $friendship = new BP_Friends_Friendship;
-        if ( (int) $friendship->is_confirmed ) {
-                return true;
-        }
-
-        // Setup the friendship data
         $friendship->initiator_user_id = $initiator_userid;
         $friendship->friend_user_id    = $friend_userid;
@@ -49 +49 @@
         $friendship->date_created      = bp_core_current_time();
 
-        if ( !empty( $force_accept ) ) {
+        if ( ! empty( $force_accept ) ) {
                 $friendship->is_confirmed = 1;
         }

trunk/tests/testcases/friends/functions.php

@@ -124 +124 @@
                 $this->assertFalse( friends_add_friend( $u1, $u1 ) );
         }
+
+        /**
+         * @group friends_add_friend
+         */
+        public function test_friends_add_friend_already_friends() {
+                $u1 = $this->create_user();
+                $u2 = $this->create_user();
+
+                friends_add_friend( $u1, $u2, true );
+
+                $this->assertTrue( friends_add_friend( $u1, $u2 ) );
+        }
 }