<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][6941] trunk: In bp_has_members(), only auto-set user_id if looking at a user friends page</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/6941">6941</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-04-22 23:31:17 +0000 (Mon, 22 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://buddypress.trac.wordpress.org/ticket/4938">#4938</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmemberstemplatephp">trunk/bp-members/bp-members-template.php</a></li>
<li><a href="#trunkteststestcasescoreclassesphp">trunk/tests/testcases/core/classes.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkteststestcasesmemberstemplatephp">trunk/tests/testcases/members/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-template.php (6940 => 6941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-template.php 2013-04-22 05:01:53 UTC (rev 6940)
+++ trunk/bp-members/bp-members-template.php 2013-04-22 23:31:17 UTC (rev 6941)
</span><span class="lines">@@ -275,8 +275,9 @@
</span><span class="cx"> $search_terms = null;
</span><span class="cx">
</span><span class="cx"> // User filtering
</span><del>- if ( bp_displayed_user_id() )
</del><ins>+ if ( bp_is_user_friends() && ! bp_is_user_friend_requests() ) {
</ins><span class="cx"> $user_id = bp_displayed_user_id();
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // type: active ( default ) | random | newest | popular | online | alphabetical
</span><span class="cx"> $defaults = array(
</span></span></pre></div>
<a id="trunkteststestcasescoreclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/core/classes.php (6940 => 6941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/core/classes.php 2013-04-22 05:01:53 UTC (rev 6940)
+++ trunk/tests/testcases/core/classes.php 2013-04-22 23:31:17 UTC (rev 6941)
</span><span class="lines">@@ -78,43 +78,4 @@
</span><span class="cx"> $friend_ids = wp_list_pluck( $friends, 'ID' );
</span><span class="cx"> $this->assertEquals( $friend_ids, array() );
</span><span class="cx"> }
</span><del>-
- 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 ) );
- }
</del><span class="cx"> }
</span></span></pre></div>
<a id="trunkteststestcasesmemberstemplatephp"></a>
<div class="addfile"><h4>Added: trunk/tests/testcases/members/template.php (0 => 6941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/members/template.php (rev 0)
+++ trunk/tests/testcases/members/template.php 2013-04-22 23:31:17 UTC (rev 6941)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+<?php
+/**
+ * @group members
+ */
+class BP_Tests_Members_Template extends BP_UnitTestCase {
+ protected $old_current_user = 0;
+
+ public function setUp() {
+ parent::setUp();
+
+ $this->old_current_user = get_current_user_id();
+ wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
+ }
+
+ public function tearDown() {
+ parent::tearDown();
+ wp_set_current_user( $this->old_current_user );
+ }
+
+ public function test_bp_user_query_include_on_user_page() {
+ $u1 = $this->create_user();
+ $u2 = $this->create_user();
+
+ $this->go_to( bp_core_get_user_domain( $u1 ) );
+
+ global $members_template;
+ bp_has_members( array(
+ 'include' => array( $u1, $u2 ),
+ ) );
+
+ $users = is_array( $members_template->members ) ? array_values( $members_template->members ) : array();
+ $user_ids = wp_list_pluck( $users, 'ID' );
+ sort( $user_ids );
+
+ $shouldbe = array( $u1, $u2 );
+ sort( $shouldbe );
+
+ $this->assertEquals( $user_ids, $shouldbe );
+ }
+
+ public function test_bp_user_query_friendship_requests() {
+ $u1 = $this->create_user();
+ $u2 = $this->create_user();
+
+ friends_add_friend( $u1, $u2 );
+
+ $this->go_to( bp_core_get_user_domain( $u2 ) . bp_get_friends_slug() . '/requests' );
+
+ 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( $request_ids, array( $u1 ) );
+ }
+
+}
</ins></span></pre>
</div>
</div>
</body>
</html>