<!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] [3408] trunk/bp-groups.php:
Use the correct group ID and user ID in groups_join_group().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3408</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-11-13 23:18:48 +0000 (Sat, 13 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use the correct group ID and user ID in groups_join_group(). Fixes #2733, props r-a-y.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (3407 => 3408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2010-11-13 20:32:19 UTC (rev 3407)
+++ trunk/bp-groups.php 2010-11-13 23:18:48 UTC (rev 3408)
</span><span class="lines">@@ -1694,21 +1694,18 @@
</span><span class="cx"> if ( !$user_id )
</span><span class="cx"> $user_id = $bp->loggedin_user->id;
</span><span class="cx">
</span><del>- /* Check if the user has an outstanding invite, is so delete it. */
</del><ins>+ // Check if the user has an outstanding invite, is so delete it.
</ins><span class="cx"> if ( groups_check_user_has_invite( $user_id, $group_id ) )
</span><span class="cx"> groups_delete_invite( $user_id, $group_id );
</span><span class="cx">
</span><del>- /* Check if the user has an outstanding request, is so delete it. */
</del><ins>+ // Check if the user has an outstanding request, is so delete it.
</ins><span class="cx"> if ( groups_check_for_membership_request( $user_id, $group_id ) )
</span><span class="cx"> groups_delete_membership_request( $user_id, $group_id );
</span><span class="cx">
</span><del>- /* User is already a member, just return true */
</del><ins>+ // User is already a member, just return true
</ins><span class="cx"> if ( groups_is_user_member( $user_id, $group_id ) )
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if ( !$bp->groups->current_group )
- $bp->groups->current_group = new BP_Groups_Group( $group_id );
-
</del><span class="cx"> $new_member = new BP_Groups_Member;
</span><span class="cx"> $new_member->group_id = $group_id;
</span><span class="cx"> $new_member->user_id = $user_id;
</span><span class="lines">@@ -1721,14 +1718,20 @@
</span><span class="cx"> if ( !$new_member->save() )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- /* Record this in activity streams */
</del><ins>+ if ( !isset( $bp->groups->current_group ) || !$bp->groups->current_group || $group_id != $bp->groups->current_group->id )
+ $group = new BP_Groups_Group( $group_id );
+ else
+ $group = $bp->groups->current_group;
+
+ // Record this in activity streams
</ins><span class="cx"> groups_record_activity( array(
</span><del>- 'action' => apply_filters( 'groups_activity_joined_group', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . esc_attr( $bp->groups->current_group->name ) . '</a>' ) ),
</del><ins>+ 'action' => apply_filters( 'groups_activity_joined_group', sprintf( __( '%1$s joined the group %2$s', 'buddypress'), bp_core_get_userlink( $user_id ), '<a href="' . bp_get_group_permalink( $group ) . '">' . esc_attr( bp_get_group_name( $group ) ) . '</a>' ) ),
</ins><span class="cx"> 'type' => 'joined_group',
</span><del>- 'item_id' => $group_id
</del><ins>+ 'item_id' => $group_id,
+ 'user_id' => $user_id
</ins><span class="cx"> ) );
</span><span class="cx">
</span><del>- /* Modify group meta */
</del><ins>+ // Modify group meta
</ins><span class="cx"> groups_update_groupmeta( $group_id, 'total_member_count', (int) groups_get_groupmeta( $group_id, 'total_member_count') + 1 );
</span><span class="cx"> groups_update_groupmeta( $group_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>