<!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] [3257] branches/1.2: Fix remove from group functionality.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3257</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-09-12 02:29:29 +0000 (Sun, 12 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix remove from group functionality.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpgroupsbpgroupsclassesphp">branches/1.2/bp-groups/bp-groups-classes.php</a></li>
<li><a href="#branches12bpgroupsphp">branches/1.2/bp-groups.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpgroupsbpgroupsclassesphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-groups/bp-groups-classes.php (3256 => 3257)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-groups/bp-groups-classes.php 2010-09-11 13:13:41 UTC (rev 3256)
+++ branches/1.2/bp-groups/bp-groups-classes.php 2010-09-12 02:29:29 UTC (rev 3257)
</span><span class="lines">@@ -776,20 +776,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function accept_invite() {
</span><del>- $this->inviter_id = 0;
- $this->is_confirmed = 1;
</del><ins>+ $this->inviter_id = 0;
+ $this->is_confirmed = 1;
</ins><span class="cx"> $this->date_modified = bp_core_current_time();
</span><ins>+
+ update_user_meta( $this->user_id, 'total_group_count', (int)get_user_meta( $this->user_id, 'total_group_count', true ) + 1 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function accept_request() {
</span><span class="cx"> $this->is_confirmed = 1;
</span><span class="cx"> $this->date_modified = bp_core_current_time();
</span><ins>+
+ update_user_meta( $this->user_id, 'total_group_count', (int)get_user_meta( $this->user_id, 'total_group_count', true ) + 1 );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- function remove( $user_id, $group_id ) {
</del><ins>+ function remove() {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- $sql = $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $user_id, $group_id );
</del><ins>+ $sql = $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d", $this->user_id, $this->group_id );
</ins><span class="cx">
</span><span class="cx"> if ( !$result = $wpdb->query( $sql ) )
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="branches12bpgroupsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-groups.php (3256 => 3257)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-groups.php 2010-09-11 13:13:41 UTC (rev 3256)
+++ branches/1.2/bp-groups.php 2010-09-12 02:29:29 UTC (rev 3257)
</span><span class="lines">@@ -868,7 +868,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Remove a user.
</span><del>- if ( !groups_remove_member( $bp->groups->current_group->id, $user_id ) )
</del><ins>+ if ( !groups_remove_member( $user_id, $bp->groups->current_group->id ) )
</ins><span class="cx"> bp_core_add_message( __( 'There was an error removing that user from the group, please try again', 'buddypress' ), 'error' );
</span><span class="cx"> else
</span><span class="cx"> bp_core_add_message( __( 'User removed successfully', 'buddypress' ) );
</span><span class="lines">@@ -2404,8 +2404,7 @@
</span><span class="cx">
</span><span class="cx"> do_action( 'groups_remove_member', $group_id, $user_id );
</span><span class="cx">
</span><del>- if ( !$member->remove( $user_id, $group_id ) )
- return false;
</del><ins>+ return $member->remove();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*** Group Membership ****************************************************/
</span></span></pre>
</div>
</div>
</body>
</html>