Changeset 7384

Timestamp:

09/17/2013 05:24:00 PM (11 years ago)

Author:

r-a-y

Message:

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 #5077. Props imath.

File:

• trunk/bp-groups/bp-groups-actions.php (modified) (1 diff)

trunk/bp-groups/bp-groups-actions.php

@@ -238 +238 @@
 add_action( 'bp_actions', 'groups_action_join_group' );
 
-
+/**
+ * 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)
+ */
 function groups_action_leave_group() {
-    global $bp;
-
-    if ( !bp_is_single_item() || !bp_is_groups_component() || !bp_is_current_action( 'leave-group' ) )
-        return false;
+    if ( ! bp_is_single_item() || ! bp_is_groups_component() || ! bp_is_current_action( 'leave-group' ) ) {
+        return false;
+    }
 
     // Nonce check
-    if ( !check_admin_referer( 'groups_leave_group' ) )
-        return false;
+    if ( ! check_admin_referer( 'groups_leave_group' ) ) {
+        return false;
+    }
 
     // User wants to leave any group
-    if ( groups_is_user_member( bp_loggedin_user_id(), $bp->groups->current_group->id ) ) {
+    if ( groups_is_user_member( bp_loggedin_user_id(), bp_get_current_group_id() ) ) {
+        $bp = buddypress();
 
         // Stop sole admins from abandoning their group
-        $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() )
+        $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() ) {
             bp_core_add_message( __( 'This group must have at least one admin', 'buddypress' ), 'error' );
-
-        elseif ( !groups_leave_group( $bp->groups->current_group->id ) )
+        } elseif ( ! groups_leave_group( $bp->groups->current_group->id ) ) {
             bp_core_add_message( __( 'There was an error leaving the group.', 'buddypress' ), 'error' );
-        else
+        } else {
             bp_core_add_message( __( 'You successfully left the group.', 'buddypress' ) );
-
-        bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
+        }
+            
+        $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() );
+        }
+
+        bp_core_redirect( $redirect );
     }