Changeset 6934 for trunk/bp-core/bp-core-classes.php

Timestamp:

04/21/2013 05:22:31 PM (13 years ago)

Author:

boonebgorges

Message:

In BP_User_Query, allow 'include' params to be combined with the 'user_id' filter

This enhancement allows plugins to filter friend lists by passing an 'include'
parameter to BP_User_Query.

Fixes #4938

Props dontdream

File:

• trunk/bp-core/bp-core-classes.php (modified) (2 diffs)

trunk/bp-core/bp-core-classes.php

@@ -297 +297 @@
 
                 // 'user_id' - When a user id is passed, limit to the friends of the user
-                // Only parse this if no 'include' param is passed, to account for
-                // friend request queries
                 // @todo remove need for bp_is_active() check
-                if ( empty( $include ) && ! empty( $user_id ) && bp_is_active( 'friends' ) ) {
+                if ( ! empty( $user_id ) && bp_is_active( 'friends' ) ) {
                         $friend_ids = friends_get_friend_user_ids( $user_id );
                         $friend_ids = $wpdb->escape( implode( ',', (array) $friend_ids ) );
@@ -307 +305 @@
                                 $sql['where'][] = "u.{$this->uid_name} IN ({$friend_ids})";
 
-                        // If the user has no friends, and we're not including specific users, make sure the query returns null
-                        } elseif ( empty( $include ) ) {
+                        // If the user has no friends, the query should always
+                        // return no users
+                        } else {
                                 $sql['where'][] = $this->no_results['where'];
                         }