Changeset 2924

Timestamp:

04/14/2010 08:49:34 PM (16 years ago)

Author:

apeatling

Message:

Fixes to selective user includes on the members loop.

Location:

branches/1.2/bp-core

Files:

• bp-core-classes.php (modified) (2 diffs)
• bp-core-templatetags.php (modified) (1 diff)

branches/1.2/bp-core/bp-core-classes.php

@@ -142 +142 @@
                         $sql['where_alpha'] = "AND pd.field_id = 1";
 
-                if ( $user_id && function_exists( 'friends_install' ) ) {
+                if ( $include ) {
+                        if ( is_array( $include ) )
+                                $uids = $wpdb->escape( implode( ',', (array)$include ) );
+                        else
+                                $uids = $wpdb->escape( $include );
+
+                        if ( !empty( $uids ) )
+                                $sql['where_users'] = "AND u.ID IN ({$uids})";
+                }
+
+                else if ( $user_id && function_exists( 'friends_install' ) ) {
                         $friend_ids = friends_get_friend_user_ids( $user_id );
                         $friend_ids = $wpdb->escape( implode( ',', (array)$friend_ids ) );
@@ -152 +162 @@
                                 return false;
                         }
-                }
-
-                if ( $include ) {
-                        /* Unset previous user restriction SQL */
-                        unset( $sql['where_friends'] );
-
-                        if ( is_array( $include ) )
-                                $uids = $wpdb->escape( implode( ',', (array)$include ) );
-                        else
-                                $uids = $wpdb->escape( $include );
-
-                        if ( !empty( $uids ) )
-                                $sql['where_users'] = "AND u.ID IN ({$uids})";
                 }
 

branches/1.2/bp-core/bp-core-templatetags.php

@@ -154 +154 @@
                         $per_page = $max;
         }
+
+        /* Make sure we return no members if we looking at friendship requests and there are none. */
+        if ( empty( $include ) && $bp->friends->slug == $bp->current_component && 'requests' == $bp->current_action )
+                return false;
 
         $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras );