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

Timestamp:

08/22/2016 09:37:39 PM (8 years ago)

Author:

r-a-y

Message:

Friends: Cast properties as integers where appropriate.

See #6977.

File:

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

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

@@ -242 +242 @@
         }
 
-        return $fids;
+        return array_map( 'intval', $fids );
     }
 
@@ -252 +252 @@
      * @param int $user_id   The ID of the first user.
      * @param int $friend_id The ID of the second user.
-     * @return int|bool The ID of the friendship object if found, otherwise false.
+     * @return int|null The ID of the friendship object if found, otherwise null.
      */
     public static function get_friendship_id( $user_id, $friend_id ) {
@@ -259 +259 @@
         $bp = buddypress();
 
-        return $wpdb->get_var( $wpdb->prepare( "SELECT id 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 ) AND is_confirmed = 1", $user_id, $friend_id, $friend_id, $user_id ) );
+        $query = $wpdb->get_var( $wpdb->prepare( "SELECT id 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 ) AND is_confirmed = 1", $user_id, $friend_id, $friend_id, $user_id ) );
+
+        return is_numeric( $query ) ? (int) $query : $query;
     }
 
@@ -282 +284 @@
 
             wp_cache_set( $user_id, $friend_requests, 'bp_friends_requests' );
+        }
+
+        // Integer casting.
+        if ( ! empty( $friend_requests ) ) {
+            $friend_requests = array_map( 'intval', $friend_requests );
         }
 
@@ -382 +389 @@
             return false;
 
-        return array( 'friends' => $filtered_friend_ids, 'total' => (int) $total_friend_ids );
+        return array( 'friends' => array_map( 'intval', $filtered_friend_ids ), 'total' => (int) $total_friend_ids );
     }