<!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] [2958] branches/1.2: Fixes #2222 props boonebgorges</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2958</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-04-28 06:35:08 +0000 (Wed, 28 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2222 props boonebgorges</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 (2957 => 2958)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-groups/bp-groups-classes.php 2010-04-28 05:44:28 UTC (rev 2957)
+++ branches/1.2/bp-groups/bp-groups-classes.php 2010-04-28 06:35:08 UTC (rev 2958)
</span><span class="lines">@@ -909,6 +909,15 @@
</span><span class="cx"> return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id != 0 AND invite_sent = 1", $user_id, $group_id ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function delete_request( $user_id, $group_id ) {
+ global $wpdb, $bp;
+
+ if ( !$user_id )
+ return false;
+
+ return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id = %d AND is_confirmed = 0 AND inviter_id = 0 AND invite_sent = 0", $user_id, $group_id ) );
+ }
+
</ins><span class="cx"> function check_is_admin( $user_id, $group_id ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span></span></pre></div>
<a id="branches12bpgroupsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-groups.php (2957 => 2958)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-groups.php 2010-04-28 05:44:28 UTC (rev 2957)
+++ branches/1.2/bp-groups.php 2010-04-28 06:35:08 UTC (rev 2958)
</span><span class="lines">@@ -2206,6 +2206,10 @@
</span><span class="cx"> if ( !$member->save() )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ /* Remove request to join */
+ if ( $member->check_for_membership_request( $user_id, $group_id ) )
+ $member->delete_request( $user_id, $group_id );
+
</ins><span class="cx"> /* Modify group meta */
</span><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="lines">@@ -2381,6 +2385,10 @@
</span><span class="cx"> if ( !$membership->save() )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ /* Check if the user has an outstanding invite, if so delete it. */
+ if ( groups_check_user_has_invite( $membership->user_id, $membership->group_id ) )
+ groups_delete_invite( $membership->user_id, $membership->group_id );
+
</ins><span class="cx"> /* Modify group member count */
</span><span class="cx"> groups_update_groupmeta( $membership->group_id, 'total_member_count', (int) groups_get_groupmeta( $membership->group_id, 'total_member_count') + 1 );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>