Changeset 8173 for trunk/bp-friends/bp-friends-functions.php

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

File:

• trunk/bp-friends/bp-friends-functions.php (modified) (2 diffs)

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;
     }