<!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][7239] trunk: Use strict type checking when setting default 'include' value in BP_User_Query</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/7239">7239</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-06-25 01:18:24 +0000 (Tue, 25 Jun 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://buddypress.trac.wordpress.org/ticket/5071">#5071</a>
Props imath</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreclassesphp">trunk/bp-core/bp-core-classes.php</a></li>
<li><a href="#trunkteststestcasesmemberstemplatephp">trunk/tests/testcases/members/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-classes.php (7238 => 7239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-classes.php 2013-06-24 19:35:15 UTC (rev 7238)
+++ trunk/bp-core/bp-core-classes.php 2013-06-25 01:18:24 UTC (rev 7239)
</span><span class="lines">@@ -315,7 +315,7 @@
</span><span class="cx"> /** WHERE *************************************************************/
</span><span class="cx">
</span><span class="cx"> // 'include' - User ids to include in the results
</span><del>- $include = ! empty( $include ) ? wp_parse_id_list( $include ) : array();
</del><ins>+ $include = false !== $include ? wp_parse_id_list( $include ) : array();
</ins><span class="cx"> $include_ids = $this->get_include_ids( $include );
</span><span class="cx"> if ( ! empty( $include_ids ) ) {
</span><span class="cx"> $include_ids = implode( ',', wp_parse_id_list( $include_ids ) );
</span></span></pre></div>
<a id="trunkteststestcasesmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/members/template.php (7238 => 7239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/members/template.php 2013-06-24 19:35:15 UTC (rev 7238)
+++ trunk/tests/testcases/members/template.php 2013-06-25 01:18:24 UTC (rev 7239)
</span><span class="lines">@@ -64,4 +64,37 @@
</span><span class="cx"> $this->set_current_user( $old_user );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * @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 );
+ }
+
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>