Changeset 6941

Timestamp:

04/22/2013 11:31:17 PM (13 years ago)

Author:

boonebgorges

Message:

In bp_has_members(), only auto-set user_id if looking at a user friends page

Previously, the 'user_id' param was being pre-filled anytime you were looking
at a user page. As a result, it was impossible to do certain kinds of query
logic while looking at friends pages.

Adds unit tests for the change.

Fixes #4938

Location:

trunk

Files:

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

trunk/bp-members/bp-members-template.php

@@ -276 +276 @@
 
         // User filtering
-        if ( bp_displayed_user_id() )
+        if ( bp_is_user_friends() && ! bp_is_user_friend_requests() ) {
                 $user_id = bp_displayed_user_id();
+        }
 
         // type: active ( default ) | random | newest | popular | online | alphabetical

trunk/tests/testcases/core/classes.php

@@ -79 +79 @@
                 $this->assertEquals( $friend_ids, array() );
         }
-
-        public function test_bp_user_query_include_on_user_page() {
-                $u1 = $this->create_user();
-                $u2 = $this->create_user();
-
-                $q = new BP_User_Query( array(
-                        // 'user_id' parameter is passed to emulate a displayed user page
-                        // @see https://buddypress.trac.wordpress.org/browser/tags/1.7/bp-members/bp-members-template.php#L277
-                        'user_id' => $u1,
-
-                        // Get all user IDs; we want to return just these IDs
-                        'include' => array( $u1, $u2 ),
-                ) );
-
-                $users = is_array( $q->results ) ? array_values( $q->results ) : array();
-                $user_ids = wp_list_pluck( $users, 'ID' );
-                $this->assertEquals( $user_ids, array( $u2, $u1 ) );
-        }
-
-        public function test_bp_user_query_friendship_requests() {
-                $u1 = $this->create_user();
-                $u2 = $this->create_user();
-
-                friends_add_friend( $u1, $u2 );
-
-                // emulate bp_has_members( 'type=alphabetical&include=' . bp_get_friendship_requests() )
-                $q = new BP_User_Query( array(
-                        // 'user_id' parameter is passed to emulate a displayed user page
-                        // @see https://buddypress.trac.wordpress.org/browser/tags/1.7/bp-members/bp-members-template.php#L277
-                        'user_id' => $u2,
-
-                        // get friendship requests for $u2
-                        'include' => bp_get_friendship_requests( $u2 ),
-                ) );
-
-                $requests = is_array( $q->results ) ? array_values( $q->results ) : array();
-                $request_ids = wp_list_pluck( $requests, 'ID' );
-                $this->assertEquals( $request_ids, array( $u1 ) );
-        }
 }