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

Timestamp:

02/11/2012 04:42:04 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in Friends component. See #3989.

File:

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

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

@@ -1 +1 @@
 <?php
-/********************************************************************************
- * Business Functions
+
+/**
+ * BuddyPress Friends Functions
  *
- * Business functions are where all the magic happens in BuddyPress. They will
+ * Functions are where all the magic happens in BuddyPress. They will
  * handle the actual saving or manipulation of information. Usually they will
  * hand off to a database class for data access, then return
  * true or false on success or failure.
+ *
+ * @package BuddyPress
+ * @subpackage FriendsFunctions
  */
 
@@ -53 +57 @@
 
 function friends_remove_friend( $initiator_userid, $friend_userid ) {
-        global $bp;
 
         $friendship_id = BP_Friends_Friendship::get_friendship_id( $initiator_userid, $friend_userid );
@@ -138 +141 @@
 
 function friends_check_friendship( $user_id, $possible_friend_id ) {
-        global $bp;
 
         if ( 'is_friend' == BP_Friends_Friendship::check_is_friend( $user_id, $possible_friend_id ) )
@@ -152 +154 @@
 
 function friends_get_total_friend_count( $user_id = 0 ) {
-        global $bp;
-
-        if ( !$user_id )
+
+        if ( empty( $user_id ) )
                 $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
 
@@ -182 +183 @@
 }
 
-function friends_get_friend_user_ids( $user_id, $friend_requests_only = false, $assoc_arr = false, $filter = false ) {
+function friends_get_friend_user_ids( $user_id, $friend_requests_only = false, $assoc_arr = false ) {
         return BP_Friends_Friendship::get_friend_user_ids( $user_id, $friend_requests_only, $assoc_arr );
 }
@@ -293 +294 @@
 
 function friends_search_users( $search_terms, $user_id, $pag_num = 0, $pag_page = 0 ) {
-        global $bp;
 
         $user_ids = BP_Friends_Friendship::search_users( $search_terms, $user_id, $pag_num, $pag_page );
 
-        if ( !$user_ids )
+        if ( empty( $user_ids ) )
                 return false;
 
+        $users = array();
         for ( $i = 0, $count = count( $user_ids ); $i < $count; ++$i )
                 $users[] = new BP_Core_User( $user_ids[$i] );
@@ -312 +313 @@
 
 function friends_update_friend_totals( $initiator_user_id, $friend_user_id, $status = 'add' ) {
-        global $bp;
 
         if ( 'add' == $status ) {
@@ -328 +328 @@
         do_action( 'friends_before_remove_data', $user_id );
 
-        BP_Friends_Friendship::delete_all_for_user($user_id);
+        BP_Friends_Friendship::delete_all_for_user( $user_id );
 
         // Remove usermeta