<!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" />
<title>[BuddyPress][7384] trunk/bp-groups/bp-groups-actions.php: Fix redirect when a user leaves a hidden group from the group's page.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7384">7384</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2013-09-17 17:24:00 +0000 (Tue, 17 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix redirect when a user leaves a hidden group from the group's page.
Usually when a user leaves a group from the group's page, it redirects
back to the group's homepage, however for hidden groups this creates
a 404.
This commit redirects the user back to their list of groups when
leaving a hidden group.
Commit also adds phpDoc and uses some API functions instead of the $bp
global.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5077">#5077</a>. Props imath.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsactionsphp">trunk/bp-groups/bp-groups-actions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-actions.php (7383 => 7384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-actions.php 2013-09-17 02:03:19 UTC (rev 7383)
+++ trunk/bp-groups/bp-groups-actions.php 2013-09-17 17:24:00 UTC (rev 7384)
</span><span class="lines">@@ -237,31 +237,47 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_actions', 'groups_action_join_group' );
</span><span class="cx">
</span><del>-
</del><ins>+/**
+ * When a group member clicks on the "Leave Group" button from a group's page,
+ * this function is run.
+ *
+ * Note: When leaving a group from the group directory, AJAX is used and
+ * another function handles this. See {@link bp_legacy_theme_ajax_joinleave_group()}.
+ *
+ * @since BuddyPress (1.2.4)
+ */
</ins><span class="cx"> function groups_action_leave_group() {
</span><del>- global $bp;
-
- if ( !bp_is_single_item() || !bp_is_groups_component() || !bp_is_current_action( 'leave-group' ) )
</del><ins>+ if ( ! bp_is_single_item() || ! bp_is_groups_component() || ! bp_is_current_action( 'leave-group' ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Nonce check
</span><del>- if ( !check_admin_referer( 'groups_leave_group' ) )
</del><ins>+ if ( ! check_admin_referer( 'groups_leave_group' ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // User wants to leave any group
</span><del>- if ( groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) ) {
</del><ins>+ if ( groups_is_user_member( bp_loggedin_user_id(), bp_get_current_group_id() ) ) {
+ $bp = buddypress();
</ins><span class="cx">
</span><span class="cx"> // Stop sole admins from abandoning their group
</span><del>- $group_admins = groups_get_group_admins( $bp->groups->current_group->id );
- if ( 1 == count( $group_admins ) && $group_admins[0]->user_id == bp_loggedin_user_id() )
</del><ins>+ $group_admins = groups_get_group_admins( bp_get_current_group_id() );
+
+ if ( 1 == count( $group_admins ) && $group_admins[0]->user_id == bp_loggedin_user_id() ) {
</ins><span class="cx"> bp_core_add_message( __( 'This group must have at least one admin', 'buddypress' ), 'error' );
</span><del>-
- elseif ( !groups_leave_group( $bp->groups->current_group->id ) )
</del><ins>+ } elseif ( ! groups_leave_group( $bp->groups->current_group->id ) ) {
</ins><span class="cx"> bp_core_add_message( __( 'There was an error leaving the group.', 'buddypress' ), 'error' );
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> bp_core_add_message( __( 'You successfully left the group.', 'buddypress' ) );
</span><ins>+ }
+
+ $redirect = bp_get_group_permalink( groups_get_current_group() );
+
+ if( 'hidden' == $bp->groups->current_group->status ) {
+ $redirect = trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() );
+ }
</ins><span class="cx">
</span><del>- bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
</del><ins>+ bp_core_redirect( $redirect );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
</span></span></pre>
</div>
</div>
</body>
</html>