<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2924] branches/1.2/bp-core:
Fixes to selective user includes on the members loop.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2924</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-04-14 20:49:34 +0000 (Wed, 14 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes to selective user includes on the members loop.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorebpcoreclassesphp">branches/1.2/bp-core/bp-core-classes.php</a></li>
<li><a href="#branches12bpcorebpcoretemplatetagsphp">branches/1.2/bp-core/bp-core-templatetags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorebpcoreclassesphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-classes.php (2923 => 2924)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-classes.php 2010-04-14 17:01:52 UTC (rev 2923)
+++ branches/1.2/bp-core/bp-core-classes.php 2010-04-14 20:49:34 UTC (rev 2924)
</span><span class="lines">@@ -141,7 +141,17 @@
</span><span class="cx"> if ( 'alphabetical' == $type )
</span><span class="cx"> $sql['where_alpha'] = "AND pd.field_id = 1";
</span><span class="cx">
</span><del>- if ( $user_id && function_exists( 'friends_install' ) ) {
</del><ins>+ if ( $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})";
+ }
+
+ else if ( $user_id && function_exists( 'friends_install' ) ) {
</ins><span class="cx"> $friend_ids = friends_get_friend_user_ids( $user_id );
</span><span class="cx"> $friend_ids = $wpdb->escape( implode( ',', (array)$friend_ids ) );
</span><span class="cx">
</span><span class="lines">@@ -153,19 +163,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $include ) {
- /* Unset previous user restriction SQL */
- unset( $sql['where_friends'] );
-
- 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})";
- }
-
</del><span class="cx"> if ( $search_terms && function_exists( 'xprofile_install' ) ) {
</span><span class="cx"> $search_terms = like_escape( $wpdb->escape( $search_terms ) );
</span><span class="cx"> $sql['where_searchterms'] = "AND pd.value LIKE '%%$search_terms%%'";
</span></span></pre></div>
<a id="branches12bpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-templatetags.php (2923 => 2924)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-templatetags.php 2010-04-14 17:01:52 UTC (rev 2923)
+++ branches/1.2/bp-core/bp-core-templatetags.php 2010-04-14 20:49:34 UTC (rev 2924)
</span><span class="lines">@@ -154,6 +154,10 @@
</span><span class="cx"> $per_page = $max;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* Make sure we return no members if we looking at friendship requests and there are none. */
+ if ( empty( $include ) && $bp->friends->slug == $bp->current_component && 'requests' == $bp->current_action )
+ return false;
+
</ins><span class="cx"> $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras );
</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>