Changeset 7239

Timestamp:

06/25/2013 01:18:24 AM (13 years ago)

Author:

boonebgorges

Message:

Use strict type checking when setting default 'include' value in BP_User_Query

Using the empty() check resulted in problems when empty arrays were passed into
BP_User_Query as the 'include' parameter, such as when querying for a user's
friend requests when the user did not have any - in these cases, all users
ended up being returned.

Fixes #5071

Props imath

Location:

trunk

Files:

• bp-core/bp-core-classes.php (modified) (1 diff)
• tests/testcases/members/template.php (modified) (1 diff)

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

@@ -316 +316 @@
 
                 // 'include' - User ids to include in the results
-                $include     = ! empty( $include ) ? wp_parse_id_list( $include ) : array();
+                $include     = false !== $include ? wp_parse_id_list( $include ) : array();
                 $include_ids = $this->get_include_ids( $include );
                 if ( ! empty( $include_ids ) ) {

trunk/tests/testcases/members/template.php

@@ -65 +65 @@
         }
 
+        /**
+         * @group bp_has_members
+         * @group friends
+         * @ticket BP5071
+         */
+        public function test_bp_has_members_friendship_requests_with_no_requests() {
+                $u1 = $this->create_user();
+                $u2 = $this->create_user();
+
+                $old_user = get_current_user_id();
+                $this->set_current_user( $u2 );
+
+                // For some reason, in all the user switching, the cache gets
+                // confused. Never comes up when BP runs normally, because the
+                // loggedin_user doesn't change on a pageload. @todo Fix for
+                // real in BP
+                wp_cache_delete( 'bp_user_domain_' . $u2, 'bp' );
+
+                $this->go_to( bp_core_get_user_domain( $u2 ) . bp_get_friends_slug() . '/requests/' );
+                $this->restore_admins();
+
+                global $members_template;
+                bp_has_members( array(
+                        'include' => bp_get_friendship_requests( $u2 ),
+                ) );
+
+                $requests = is_array( $members_template->members ) ? array_values( $members_template->members ) : array();
+                $request_ids = wp_list_pluck( $requests, 'ID' );
+                $this->assertEquals( array(), $request_ids );
+
+                $this->set_current_user( $old_user );
+        }
+
 }