<!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] [2120] trunk: Merging 1.
1 branch r2113 through r2119 into trunk.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2120</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-11-25 10:32:06 +0000 (Wed, 25 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merging 1.1 branch r2113 through r2119 into trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsphp">trunk/bp-blogs.php</a></li>
<li><a href="#trunkbpcorebpcoreavatarsphp">trunk/bp-core/bp-core-avatars.php</a></li>
<li><a href="#trunkbpfriendsphp">trunk/bp-friends.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsclassesphp">trunk/bp-groups/bp-groups-classes.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsnotificationsphp">trunk/bp-groups/bp-groups-notifications.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs.php (2119 => 2120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php 2009-11-25 10:26:14 UTC (rev 2119)
+++ trunk/bp-blogs.php 2009-11-25 10:32:06 UTC (rev 2120)
</span><span class="lines">@@ -448,6 +448,10 @@
</span><span class="cx"> if ( !$user_id )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ /* If this is a password protected post, don't record the comment */
+ if ( !empty( $post->post_password ) )
+ return false;
+
</ins><span class="cx"> $recorded_comment = new BP_Blogs_Comment;
</span><span class="cx"> $recorded_comment->user_id = $user_id;
</span><span class="cx"> $recorded_comment->blog_id = $wpdb->blogid;
</span></span></pre></div>
<a id="trunkbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-avatars.php (2119 => 2120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-avatars.php 2009-11-25 10:26:14 UTC (rev 2119)
+++ trunk/bp-core/bp-core-avatars.php 2009-11-25 10:32:06 UTC (rev 2120)
</span><span class="lines">@@ -77,9 +77,12 @@
</span><span class="cx"> if ( !$avatar_dir ) return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !$css_id )
- $css_id = $object . '-' . $item_id . '-avatar';
</del><ins>+ /* Add an identifying class to each item */
+ $class .= ' ' . $object . '-' . $item_id . '-avatar';
</ins><span class="cx">
</span><ins>+ if ( !empty($css_id) )
+ $css_id = " id='{$css_id}'";
+
</ins><span class="cx"> if ( $width )
</span><span class="cx"> $html_width = " width='{$width}'";
</span><span class="cx"> else
</span><span class="lines">@@ -112,7 +115,7 @@
</span><span class="cx"> closedir($av_dir);
</span><span class="cx">
</span><span class="cx"> if ( $avatar_url )
</span><del>- return apply_filters( 'bp_core_fetch_avatar', "<img src='{$avatar_url}' alt='{$alt}' id='{$css_id}' class='{$class}'{$html_width}{$html_height} />", $params );
</del><ins>+ return apply_filters( 'bp_core_fetch_avatar', "<img src='{$avatar_url}' alt='{$alt}' class='{$class}'{$css_id}{$html_width}{$html_height} />", $params );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* If no avatars have been uploaded for this item, display a gravatar */
</span><span class="lines">@@ -137,7 +140,7 @@
</span><span class="cx"> $grav_email = apply_filters( 'bp_core_gravatar_email', $grav_email, $item_id, $object );
</span><span class="cx"> $gravatar = apply_filters( 'bp_gravatar_url', 'http://www.gravatar.com/avatar/' ) . md5( $grav_email ) . '?d=' . $default_grav . '&amp;s=' . $grav_size;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_core_fetch_avatar', "<img src='{$gravatar}' alt='{$alt}' id='{$css_id}' class='{$class}'{$html_width}{$html_height} />", $params );
</del><ins>+ return apply_filters( 'bp_core_fetch_avatar', "<img src='{$gravatar}' alt='{$alt}' class='{$class}'{$css_id}{$html_width}{$html_height} />", $params );
</ins><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkbpfriendsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends.php (2119 => 2120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends.php 2009-11-25 10:26:14 UTC (rev 2119)
+++ trunk/bp-friends.php 2009-11-25 10:32:06 UTC (rev 2120)
</span><span class="lines">@@ -117,8 +117,7 @@
</span><span class="cx">
</span><span class="cx"> if ( isset($bp->action_variables) && 'accept' == $bp->action_variables[0] && is_numeric($bp->action_variables[1]) ) {
</span><span class="cx"> /* Check the nonce */
</span><del>- if ( !check_admin_referer( 'friends_accept_friendship' ) )
- return false;
</del><ins>+ check_admin_referer( 'friends_accept_friendship' );
</ins><span class="cx">
</span><span class="cx"> if ( friends_accept_friendship( $bp->action_variables[1] ) ) {
</span><span class="cx"> bp_core_add_message( __( 'Friendship accepted', 'buddypress' ) );
</span><span class="lines">@@ -129,9 +128,9 @@
</span><span class="cx">
</span><span class="cx"> } else if ( isset($bp->action_variables) && 'reject' == $bp->action_variables[0] && is_numeric($bp->action_variables[1]) ) {
</span><span class="cx"> /* Check the nonce */
</span><del>- if ( !check_admin_referer( 'friends_reject_friendship' ) )
- return false;
</del><ins>+ check_admin_referer( 'friends_reject_friendship' );
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> if ( friends_reject_friendship( $bp->action_variables[1] ) ) {
</span><span class="cx"> bp_core_add_message( __( 'Friendship rejected', 'buddypress' ) );
</span><span class="cx"> } else {
</span><span class="lines">@@ -629,7 +628,7 @@
</span><span class="cx"> $initiator_link = bp_core_get_userlink( $friendship->initiator_user_id );
</span><span class="cx"> $friend_link = bp_core_get_userlink( $friendship->friend_user_id );
</span><span class="cx">
</span><del>- $primary_link = apply_filters( 'friends_activity_friendship_accepted_primary_link', bp_core_get_userlink( $friendship->initiator_user_id ), &$friendship );
</del><ins>+ $primary_link = apply_filters( 'friends_activity_friendship_accepted_primary_link', bp_core_get_userurl( $friendship->initiator_user_id ), &$friendship );
</ins><span class="cx">
</span><span class="cx"> /* Record in activity streams for the initiator */
</span><span class="cx"> friends_record_activity( array(
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-classes.php (2119 => 2120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2009-11-25 10:26:14 UTC (rev 2119)
+++ trunk/bp-groups/bp-groups-classes.php 2009-11-25 10:32:06 UTC (rev 2120)
</span><span class="lines">@@ -421,12 +421,21 @@
</span><span class="cx"> function get_all( $limit = null, $page = null, $only_public = true, $sort_by = false, $order = false ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><ins>+ // Default sql WHERE conditions are blank. TODO: generic handler function.
+ $where_sql = null;
+ $where_conditions = array();
+
+ // Limit results to public status
</ins><span class="cx"> if ( $only_public )
</span><del>- $public_sql = $wpdb->prepare( " AND g.status = 'public'" );
</del><ins>+ $where_conditions[] = $wpdb->prepare( "g.status = 'public'" );
</ins><span class="cx">
</span><span class="cx"> if ( !is_site_admin() )
</span><del>- $hidden_sql = $wpdb->prepare( " AND g.status != 'hidden'");
</del><ins>+ $where_conditions[] = $wpdb->prepare( "g.status != 'hidden'");
</ins><span class="cx">
</span><ins>+ // Build where sql statement if necessary
+ if ( !empty( $where_conditions ) )
+ $where_sql = 'WHERE ' . join( ' AND ', $where_conditions );
+
</ins><span class="cx"> if ( $limit && $page )
</span><span class="cx"> $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
</span><span class="cx">
</span><span class="lines">@@ -437,7 +446,7 @@
</span><span class="cx">
</span><span class="cx"> switch ( $sort_by ) {
</span><span class="cx"> default:
</span><del>- $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g WHERE 1=1 {$public_sql} {$hidden_sql} {$order_sql} {$pag_sql}" );
</del><ins>+ $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g {$where_sql} {$order_sql} {$pag_sql}" );
</ins><span class="cx"> break;
</span><span class="cx"> case 'members':
</span><span class="cx"> $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g, {$bp->groups->table_name_groupmeta} gm WHERE g.id = gm.group_id AND gm.meta_key = 'total_member_count' {$hidden_sql} {$public_sql} ORDER BY CONVERT(gm.meta_value, SIGNED) {$order} {$pag_sql}" );
</span><span class="lines">@@ -447,7 +456,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g {$public_sql} {$hidden_sql} {$order_sql} {$pag_sql}" );
</del><ins>+ $sql = $wpdb->prepare( "SELECT * FROM {$bp->groups->table_name} g {$where_sql} {$order_sql} {$pag_sql}" );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return $wpdb->get_results($sql);
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-notifications.php (2119 => 2120)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-notifications.php 2009-11-25 10:26:14 UTC (rev 2119)
+++ trunk/bp-groups/bp-groups-notifications.php 2009-11-25 10:32:06 UTC (rev 2120)
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx">
</span><span class="cx"> $settings_link = bp_core_get_user_domain( $invited_user_id ) . 'settings/notifications/';
</span><span class="cx"> $invited_link = bp_core_get_user_domain( $invited_user_id );
</span><del>- $invites_link = $invited_link . '/' . $bp->groups->slug . '/invites';
</del><ins>+ $invites_link = $invited_link . $bp->groups->slug . '/invites';
</ins><span class="cx">
</span><span class="cx"> // Set up and send the message
</span><span class="cx"> $to = $invited_ud->user_email;
</span></span></pre>
</div>
</div>
</body>
</html>