<!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][5906] trunk: Reworks some functions around the querying of friendship requests:</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, #logmsg > ol { margin-left: 0; 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/5906">5906</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-03-11 16:39:44 +0000 (Sun, 11 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reworks some functions around the querying of friendship requests:
- Refactors bp_get_friendship_requests() so that it accepts a manual user_id parameter, and so that it falls back on the displayed_user rather than the loggedin_user (for future administrative tasks)
- Reconfigures the return value of bp_get_friendship_requests() so that a 0 is returned when there are no pending requests, to ensure that a non-false value is passed to bp_has_members() when viewing the Requests page of a user with no pending requests
- Removes the hardcoded 'return false' from bp_has_members() that would occur when an empty 'include' parameter was passed on the Requests page, so that sidebar widgets using bp_has_members() would work properly
- Reconfigures the 'include' logic in BP_Core_User::get_users() so that a value of 0 or '0' results in a false result, while continuing to respect legacy behavior of the default false value
- Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4066">#4066</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreclassesphp">trunk/bp-core/bp-core-classes.php</a></li>
<li><a href="#trunkbpfriendsbpfriendstemplatephp">trunk/bp-friends/bp-friends-template.php</a></li>
<li><a href="#trunkbpmembersbpmemberstemplatephp">trunk/bp-members/bp-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 (5905 => 5906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-classes.php 2012-03-11 15:58:14 UTC (rev 5905)
+++ trunk/bp-core/bp-core-classes.php 2012-03-11 16:39:44 UTC (rev 5906)
</span><span class="lines">@@ -255,27 +255,33 @@
</span><span class="cx"> $sql['where_exclude'] = "AND u.ID NOT IN ({$exclude})";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !empty( $include ) ) {
- if ( is_array( $include ) ) {
- $uids = $wpdb->escape( implode( ',', (array) $include ) );
- } else {
- $uids = $wpdb->escape( $include );
</del><ins>+ // Passing an $include value of 0 or '0' will necessarily result in an empty set
+ // returned. The default value of false will hit the 'else' clause.
+ if ( 0 === $include || '0' === $include ) {
+ $sql['where_users'] = "AND 0 = 1";
+ } else {
+ if ( !empty( $include ) ) {
+ if ( is_array( $include ) ) {
+ $uids = $wpdb->escape( implode( ',', (array) $include ) );
+ } else {
+ $uids = $wpdb->escape( $include );
+ }
+
+ if ( !empty( $uids ) ) {
+ $sql['where_users'] = "AND u.ID IN ({$uids})";
+ }
+ } elseif ( !empty( $user_id ) && bp_is_active( 'friends' ) ) {
+ $friend_ids = friends_get_friend_user_ids( $user_id );
+ $friend_ids = $wpdb->escape( implode( ',', (array) $friend_ids ) );
+
+ if ( !empty( $friend_ids ) ) {
+ $sql['where_friends'] = "AND u.ID IN ({$friend_ids})";
+
+ // User has no friends, return false since there will be no users to fetch.
+ } else {
+ return false;
+ }
</ins><span class="cx"> }
</span><del>-
- if ( !empty( $uids ) ) {
- $sql['where_users'] = "AND u.ID IN ({$uids})";
- }
- } elseif ( !empty( $user_id ) && bp_is_active( 'friends' ) ) {
- $friend_ids = friends_get_friend_user_ids( $user_id );
- $friend_ids = $wpdb->escape( implode( ',', (array) $friend_ids ) );
-
- if ( !empty( $friend_ids ) ) {
- $sql['where_friends'] = "AND u.ID IN ({$friend_ids})";
-
- // User has no friends, return false since there will be no users to fetch.
- } else {
- return false;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty( $search_terms ) && bp_is_active( 'xprofile' ) ) {
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-template.php (5905 => 5906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-template.php 2012-03-11 15:58:14 UTC (rev 5905)
+++ trunk/bp-friends/bp-friends-template.php 2012-03-11 16:39:44 UTC (rev 5906)
</span><span class="lines">@@ -378,8 +378,34 @@
</span><span class="cx">
</span><span class="cx"> return implode( ',', friends_get_friend_user_ids( $user_id ) );
</span><span class="cx"> }
</span><del>-function bp_get_friendship_requests() {
- return apply_filters( 'bp_get_friendship_requests', implode( ',', (array) friends_get_friendship_request_user_ids( bp_loggedin_user_id() ) ) );
</del><ins>+
+/**
+ * Get a user's friendship requests
+ *
+ * Note that we return a 0 if no pending requests are found. This is necessary because of the
+ * structure of the $include parameter in bp_has_members().
+ *
+ * @param int $user_id Defaults to displayed user
+ * @return mixed Returns an array of users if found, or a 0 if none are found
+ */
+function bp_get_friendship_requests( $user_id = 0 ) {
+ if ( !$user_id ) {
+ $user_id = bp_displayed_user_id();
+ }
+
+ if ( !$user_id ) {
+ return 0;
+ }
+
+ $requests = friends_get_friendship_request_user_ids( $user_id );
+
+ if ( !empty( $requests ) ) {
+ $requests = implode( ',', (array) $requests );
+ } else {
+ $requests = 0;
+ }
+
+ return apply_filters( 'bp_get_friendship_requests', $requests );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_friend_friendship_id() {
</span></span></pre></div>
<a id="trunkbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-template.php (5905 => 5906)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-template.php 2012-03-11 15:58:14 UTC (rev 5905)
+++ trunk/bp-members/bp-members-template.php 2012-03-11 16:39:44 UTC (rev 5906)
</span><span class="lines">@@ -314,10 +314,6 @@
</span><span class="cx"> if ( !empty( $max ) && ( $per_page > $max ) )
</span><span class="cx"> $per_page = $max;
</span><span class="cx">
</span><del>- // Make sure we return no members if we looking at friendship requests and there are none.
- if ( empty( $include ) && bp_is_friends_component() && bp_is_current_action( 'requests' ) )
- return false;
-
</del><span class="cx"> $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras, $exclude, $meta_key, $meta_value, $page_arg );
</span><span class="cx"> return apply_filters( 'bp_has_members', $members_template->has_members(), $members_template );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>