Changeset 14044

Timestamp:

10/10/2024 07:57:42 PM (8 months ago)

Author:

imath

Message:

Move the invite_status group meta check out of groups_join_group()

[13874] introduced a regression where groups whose creation process is abandoned become unjoinable & or when using the WP BuddyPress CLI to create groups.

To avoid this, we now perform the check higher up the chain, namely in the places in BuddyPress where groups_join_group() is called.

Props boonebgorges, vapvarun.

Fixes #9241 (branch 14.0)
See #9162

Location:

branches/14.0/src

Files:

• bp-groups/actions/join.php (modified) (1 diff)
• bp-groups/bp-groups-functions.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)
• bp-templates/bp-nouveau/includes/groups/ajax.php (modified) (1 diff)

branches/14.0/src/bp-groups/actions/join.php

@@ -16 +16 @@
 
     if ( ! bp_is_single_item() || ! bp_is_groups_component() || ! bp_is_current_action( 'join' ) ) {
+        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;
     }

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

@@ -662 +662 @@
     $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;
     }

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

@@ -1615 +1615 @@
             if ( ! bp_current_user_can( 'groups_join_group', array( 'group_id' => $group->id ) ) ) {
                 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;
             }
 

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

@@ -169 +169 @@
                     'type'     => 'error',
                 );
-            } elseif ( 'public' !== $group->status ) {
+            } elseif ( 'public' !== $group->status || ! groups_get_groupmeta( $group->id, 'invite_status' ) ) {
                 $response = array(
                     'feedback' => $errors['cannot'],