Ticket #7436: 7346.diff

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

@@ -603 +603 @@
                         return 'not_friends';
                 }
 
-                /*
-                 * Find friendships where the possible_friend_userid is the
-                 * initiator or friend.
-                 */
-                $args = array(
-                        'initiator_user_id' => $possible_friend_userid,
-                        'friend_user_id'    => $possible_friend_userid
-                );
-                $result = self::get_friendships( $initiator_userid, $args, 'OR' );
+                $cache_key_1 = $initiator_userid . ':' . $possible_friend_userid;
+                $cache_key_2 = $possible_friend_userid . ':' . $initiator_userid;
 
-                if ( $result ) {
-                        $friendship = current( $result );
-                        if ( ! $friendship->is_confirmed ) {
-                                $status = $initiator_userid == $friendship->initiator_user_id ? 'pending' : 'awaiting_response';
+                $cached = bp_core_get_incremented_cache( $cache_key_1, 'friends' );
+                if ( false === $cached ) {
+                        $cached = bp_core_get_incremented_cache( $cache_key_2, 'friends' );
+                }
+
+                if ( false === $cached ) {
+                        $result = $wpdb->get_results( $wpdb->prepare( "SELECT id, initiator_user_id, is_confirmed FROM {$bp->friends->table_name} WHERE (initiator_user_id = %d AND friend_user_id = %d) OR (initiator_user_id = %d AND friend_user_id = %d)", $initiator_userid, $possible_friend_userid, $possible_friend_userid, $initiator_userid ) );
+
+                        if ( ! empty( $result ) ) {
+                                if ( 0 == (int) $result[0]->is_confirmed ) {
+                                        $status = $initiator_userid == $result[0]->initiator_user_id ? 'pending' : 'awaiting_response';
+                                } else {
+                                        $status = 'is_friend';
+                                }
                         } else {
-                                $status = 'is_friend';
+                                $status = 'not_friends';
                         }
+
+                        bp_core_set_incremented_cache( $cache_key_1, 'friends', $status );
                 } else {
-                        $status = 'not_friends';
+                        $status = $cached;
                 }
 
                 return $status;