Ticket #9241: 9241.diff

src/bp-groups/actions/join.php

@@ -18 +18 @@
                 return;
         }
 
+        /*
+         * Ensure that the invite_status key exists, to avoid a group being joinable when its
+         * creation process was interrupted.
+         */
+        if ( ! groups_get_groupmeta( bp_get_current_group_id(), 'invite_status' ) ) {
+                return;
+        }
+
         // Nonce check.
         if ( ! check_admin_referer( 'groups_join_group' ) ) {
                 return;

src/bp-groups/bp-groups-functions.php

@@ -664 +664 @@
 
         $group = bp_get_group( $group );
 
-        /*
-         * When the group create first step is completed, the group's status has not been defined by the
-         * group creator yet and defaults to public. As the group status & the invite status are set once
-         * the group create second step is completed, we need to wait for this step to be achieved to let
-         * users join the group being created otherwise it would be possible for a user to "pre-join" a
-         * private/hidden group. Checking if the invite status is set is the only way to make sure this
-         * second step has been completed. If it's not the case, no need to go further.
-         */
-        if ( empty( $group->id ) || ! groups_get_groupmeta( $group->id, 'invite_status' ) ) {
+        if ( empty( $group->id ) ) {
                 return false;
         }
 

src/bp-templates/bp-legacy/buddypress-functions.php

@@ -1616 +1616 @@
                                 esc_html_e( 'Error joining group', 'buddypress' );
                         }
 
+                        /*
+                         * Ensure that the invite_status key exists, to avoid a group
+                         * being joinable when its creation process was interrupted.
+                         */
+                        if ( ! groups_get_groupmeta( $group->id, 'invite_status' ) ) {
+                                esc_html_e( 'Error joining group', 'buddypress' );
+                                break;
+                        }
+
                         check_ajax_referer( 'groups_join_group' );
 
                         if ( ! groups_join_group( $group->id ) ) {

src/bp-templates/bp-nouveau/includes/groups/ajax.php

@@ -173 +173 @@
                                         'feedback' => $errors['cannot'],
                                         'type'     => 'error',
                                 );
-                        } elseif ( ! groups_join_group( $group->id ) ) {
-                                $response = array(
-                                        'feedback' => sprintf(
-                                                '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>%s</p></div>',
-                                                esc_html__( 'Error joining this group.', 'buddypress' )
-                                        ),
-                                        'type'     => 'error',
-                                );
-                        } else {
-                                // User is now a member of the group
-                                $group->is_member = '1';
+                        } elseif ( groups_get_groupmeta( $group->id, 'invite_status' ) && ! groups_join_group( $group->id ) ) {
+                                        $response = array(
+                                                'feedback' => sprintf(
+                                                        '<div class="bp-feedback error"><span class="bp-icon" aria-hidden="true"></span><p>%s</p></div>',
+                                                        esc_html__( 'Error joining this group.', 'buddypress' )
+                                                ),
+                                                'type'     => 'error',
+                                        );
+                                } else {
+                                        // User is now a member of the group
+                                        $group->is_member = '1';
 
-                                $response = array(
-                                        'contents' => bp_get_group_join_button( $group ),
-                                        'is_group' => bp_is_group(),
-                                        'type'     => 'success',
-                                );
-                        }
+                                        $response = array(
+                                                'contents' => bp_get_group_join_button( $group ),
+                                                'is_group' => bp_is_group(),
+                                                'type'     => 'success',
+                                        );
+                                }
                         break;
 
                         case 'groups_request_membership' :