Changeset 1356

Timestamp:

04/20/2009 10:56:00 AM (15 years ago)

Author:

apeatling

Message:

Fixes #680

Location:

trunk

Files:

• bp-friends/bp-friends-classes.php (modified) (2 diffs)
• bp-friends/bp-friends-templatetags.php (modified) (3 diffs)
• bp-themes/buddypress-member/friends/friends-loop.php (modified) (1 diff)

trunk/bp-friends/bp-friends-classes.php

@@ -142 +142 @@
         global $wpdb, $bp;
         
+        // TODO: Optimize this function.
+        
         if ( !$user_id )
             $user_id = $bp->loggedin_user->id;
         
         like_escape($filter);
-        $usermeta_table = $wpdb->prefix . 'usermeta';
         
         if ( $limit && $page )
@@ -156 +157 @@
         // Get all the user ids for the current user's friends.
         $fids = implode( ',', $friend_ids );
+        
+        if ( empty($fids) )
+            return false;
 
         // filter the user_ids based on the search criteria.
         if ( function_exists('xprofile_install') ) {
-            $sql = $wpdb->prepare( "SELECT DISTINCT user_id FROM {$bp->profile->table_name_data} WHERE user_id IN ($fids) AND value LIKE '$filter%%'" );
-        } else {
-            $sql = $wpdb->prepare( "SELECT DISTINCT user_id FROM $usermeta_table WHERE user_id IN ($fids) AND meta_key = 'nickname' AND meta_value LIKE '$filter%%'" );
-        }
-
-        $filtered_friends = $wpdb->get_results( $sql, ARRAY_A );    
-
-        if ( !$filtered_friends )
-            return false;
-
-        // Get the total number of friendships
-        $total_friends = $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 ) );
-        
-        return array( 'friends' => $filtered_friends, 'total' => $total_friends );
-    }
-        
+            $sql = $wpdb->prepare( "SELECT DISTINCT user_id FROM {$bp->profile->table_name_data} WHERE user_id IN ($fids) AND value LIKE '$filter%%' {$pag_sql}" );
+            $total_sql = $wpdb->prepare( "SELECT DISTINCT count(user_id) FROM {$bp->profile->table_name_data} WHERE user_id IN ($fids) AND value LIKE '$filter%%'" );
+        } else {
+            $sql = $wpdb->prepare( "SELECT DISTINCT user_id FROM " . CUSTOM_USER_META_TABLE . " WHERE user_id IN ($fids) AND meta_key = 'nickname' AND meta_value LIKE '$filter%%' {$pag_sql}" );
+            $total_sql = $wpdb->prepare( "SELECT DISTINCT count(user_id) FROM " . CUSTOM_USER_META_TABLE . " WHERE user_id IN ($fids) AND meta_key = 'nickname' AND meta_value LIKE '$filter%%'" );
+        }
+
+        $filtered_friend_ids = $wpdb->get_results($sql);    
+        $total_friend_ids = $wpdb->get_var($sql);   
+        
+        if ( !$filtered_friend_ids )
+            return false;
+
+        return array( 'friends' => $filtered_friend_ids, 'total' => (int)$total_friend_ids );
+    }
+            
     function check_is_friend( $loggedin_userid, $possible_friend_userid ) {
         global $wpdb, $bp;

trunk/bp-friends/bp-friends-templatetags.php

@@ -101 +101 @@
         $this->in_the_loop = true;
         $this->friendship = $this->next_friendship();
-        
+
         if ( 'requests' == $bp->current_action ) {
             $this->friendship = new BP_Friends_Friendship( $this->friendship );
+            $this->friendship->user_id = ( $this->friendship->friend_user_id == $bp->loggedin_user->id ) ?  $this->friendship->initiator_user_id : $this->friendship->friend_user_id;
         } else {
             $this->friendship = (object) $this->friendship;
-            
+
             if ( !$this->friendship->friend = wp_cache_get( 'bp_user_' . $this->friendship->user_id, 'bp' ) ) {
                 $this->friendship->friend = new BP_Core_User( $this->friendship->user_id );
@@ -112 +113 @@
             }
         }
-        
+
         if ( 0 == $this->current_friendship ) // loop has just started
             do_action('loop_start');
@@ -263 +264 @@
     </form>
 <?php
+}
+
+function bp_friends_is_filtered() {
+    if ( isset( $_POST['friend-search-box'] ) )
+        return true;
+    
+    return false;
 }
 

trunk/bp-themes/buddypress-member/friends/friends-loop.php

@@ -24 +24 @@
     <?php else: ?>
 
-        <div id="message" class="info">
-            <p><?php bp_word_or_name( __( "Your friends list is currently empty", 'buddypress' ), __( "%s's friends list is currently empty", 'buddypress' ) ) ?></p>
-        </div>
+        <?php if ( bp_friends_is_filtered() ) : ?>
+            <div id="message" class="info">
+                <p><?php _e( "No friends matched your search filter terms", 'buddypress' ) ?></p>
+            </div>          
+        <?php else : ?>
+            <div id="message" class="info">
+                <p><?php bp_word_or_name( __( "Your friends list is currently empty", 'buddypress' ), __( "%s's friends list is currently empty", 'buddypress' ) ) ?></p>
+            </div>
+        <?php endif; ?>
         
-        <?php if ( bp_is_home() ) : ?>
+        <?php if ( bp_is_home() && !bp_friends_is_filtered() ) : ?>
             <h3><?php _e( 'Why not make friends with some of these members?', 'buddypress' ) ?></h3>
             <?php bp_friends_random_members() ?>