<!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] [2538] trunk: Fixes #1753</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2538</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-02 17:32:15 +0000 (Tue, 02 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1753</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (2537 => 2538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2010-02-02 16:53:40 UTC (rev 2537)
+++ trunk/bp-groups.php 2010-02-02 17:32:15 UTC (rev 2538)
</span><span class="lines">@@ -210,8 +210,6 @@
</span><span class="cx"> if ( is_user_logged_in() && groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
</span><span class="cx"> if ( function_exists('friends_install') )
</span><span class="cx"> bp_core_new_subnav_item( array( 'name' => __( 'Send Invites', 'buddypress' ), 'slug' => 'send-invites', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_invite', 'item_css_id' => 'invite', 'position' => 70, 'user_has_access' => $bp->groups->current_group->user_has_access ) );
</span><del>-
- //bp_core_new_subnav_item( array( 'name' => __( 'Leave Group', 'buddypress' ), 'slug' => 'leave-group', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_leave', 'item_css_id' => 'eave', 'position' => 110, 'user_has_access' => $bp->groups->current_group->user_has_access ) );
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -595,42 +593,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function groups_screen_group_leave() {
- global $bp;
-
- if ( $bp->is_single_item ) {
- if ( isset($bp->action_variables) && 'yes' == $bp->action_variables[0] ) {
- // Check if the user is the group admin first.
- if ( count( groups_get_group_admins( $bp->groups->current_group->id ) ) < 2 ) {
- if ( groups_is_user_admin( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) {
- bp_core_add_message( __('As the only group administrator, you cannot leave this group.', 'buddypress'), 'error' );
- bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
- }
- }
-
- // remove the user from the group.
- if ( !groups_leave_group( $bp->groups->current_group->id ) ) {
- bp_core_add_message( __('There was an error leaving the group. Please try again.', 'buddypress'), 'error' );
- bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
- } else {
- bp_core_add_message( __('You left the group successfully.', 'buddypress') );
- bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug );
- }
-
- } else if ( isset($bp->action_variables) && 'no' == $bp->action_variables[0] ) {
-
- bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
-
- } else {
-
- do_action( 'groups_screen_group_leave', $bp->groups->current_group->id );
-
- // Show leave group page
- bp_core_load_template( apply_filters( 'groups_template_group_leave', 'groups/single/home' ) );
- }
- }
-}
-
</del><span class="cx"> function groups_screen_group_request_membership() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="lines">@@ -1659,6 +1621,12 @@
</span><span class="cx"> if ( !$user_id )
</span><span class="cx"> $user_id = $bp->loggedin_user->id;
</span><span class="cx">
</span><ins>+ /* Don't let single admins leave the group. */
+ if ( count( groups_get_group_admins( $group_id ) ) < 2 ) {
+ if ( groups_is_user_admin( $user_id, $group_id ) )
+ return false;
+ }
+
</ins><span class="cx"> // This is exactly the same as deleting and invite, just is_confirmed = 1 NOT 0.
</span><span class="cx"> if ( !groups_uninvite_user( $user_id, $group_id, true ) )
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (2537 => 2538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2010-02-02 16:53:40 UTC (rev 2537)
+++ trunk/bp-themes/bp-default/_inc/global.js 2010-02-02 17:32:15 UTC (rev 2538)
</span><span class="lines">@@ -721,8 +721,6 @@
</span><span class="cx"> },
</span><span class="cx"> function(response)
</span><span class="cx"> {
</span><del>- response = response.substr(0, response.length-1);
-
</del><span class="cx"> var action = thelink.attr('rel');
</span><span class="cx"> var parentdiv = thelink.parent();
</span><span class="cx">
</span><span class="lines">@@ -772,7 +770,6 @@
</span><span class="cx"> },
</span><span class="cx"> function(response)
</span><span class="cx"> {
</span><del>- response = response.substr(0, response.length-1);
</del><span class="cx"> var parentdiv = thelink.parent();
</span><span class="cx">
</span><span class="cx"> if ( !j('body.directory').length )
</span></span></pre>
</div>
</div>
</body>
</html>