Ticket #40: reference.patch

bp-friends.php

@@ -210 +210 @@
  Return an array of friend objects for the current user.
 **************************************************************************/
 
-function friends_get_friendships( $user_id = false, $friendship_ids = false, $pag_num = 5, $pag_page = 1, $get_requests = false, $count = false ) {
+function friends_get_friendships( $user_id = false, &$friendship_ids = false, $pag_num = 5, $pag_page = 1, $get_requests = false, $count = false ) {
         global $current_userid;
 
         if ( !$user_id )

bp-friends/bp-friends-ajax.php

@@ -14 +14 @@
         $total_friend_count = 0;
 
         if ( $_POST['friend-search-box'] == "" ) {
-                $friendships = friends_get_friendships( $creds['current_userid'], false, $pag_num, $pag_page, false );
+                $friendships = friends_get_friendships( $creds['current_userid'], $ids = false, $pag_num, $pag_page, false );
         } else {
                 $friendships = BP_Friends_Friendship::search_friends( $_POST['friend-search-box'], $creds['current_userid'], $pag_num, $pag_page );
         }

bp-friends/bp-friends-classes.php

@@ -152 +152 @@
                 // Get the total number of friendships
                 $fs_count = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM $bp_friends_table_name WHERE (friend_user_id IN ($filtered_fids) AND initiator_user_id = %d) OR (initiator_user_id IN ($filtered_fids) AND friend_user_id = %d)", $user_id, $user_id ) );
                 
-                $friendships = friends_get_friendships( $user_id, &$fs_ids, 5, 1, false, $fs_count );
+                $friendships = friends_get_friendships( $user_id, $fs_ids, 5, 1, false, $fs_count );
 
                 return $friendships;
         }

bp-friends/bp-friends-templatetags.php

@@ -26 +26 @@
                         $this->friendships = BP_Friends_Friendship::search_friends( $_POST['friend-search-box'], $current_userid, $this->pag_num, $this->pag_page );
                 } else if ( $current_action == 'requests' ) {
                         // Friendship Requests
-                        $this->friendships = friends_get_friendships( $current_userid, false, $this->pag_num, $this->pag_page, true );
+                        $this->friendships = friends_get_friendships( $current_userid, $ids = false, $this->pag_num, $this->pag_page, true );
                 } else {
                         // All confirmed friendships
-                        $this->friendships = friends_get_friendships( $current_userid, false, $this->pag_num, $this->pag_page, false );
+                        $this->friendships = friends_get_friendships( $current_userid, $ids = false, $this->pag_num, $this->pag_page, false );
                 }
 
                 $this->total_friend_count = (int)$this->friendships['count'];