Changeset 13876 for trunk/src/bp-templates/bp-legacy/buddypress-functions.php

Timestamp:

05/27/2024 07:30:17 PM (22 months ago)

Author:

imath

Message:

Groups: improve the way BuddyPress handles public group invites

• In bp_group_join_button(): use specific arguments in case a user has been invited to join a public group to generate the action button.
• In BP Legacy, update the bp_legacy_theme_ajax_joinleave_group() ajax callback to move the group request capability check at the right place & remove a wrong extra check about the invite approvement case.

Fixes #9054
Closes ​https://github.com/buddypress/buddypress/pull/292

File:

• trunk/src/bp-templates/bp-legacy/buddypress-functions.php (modified) (4 diffs)

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

@@ -7 +7 @@
  * @package BuddyPress
  * @subpackage BP_Theme_Compat
- * @version 12.0.0
+ * @version 14.0.0
  */
 
@@ -1611 +1611 @@
     if ( groups_is_user_member( bp_loggedin_user_id(), $group->id ) ) {
         $request_type = 'leave_group';
-    } elseif ( groups_check_user_has_invite( bp_loggedin_user_id(), $group->id ) && 'joinleave_group' !== $action ) {
+    } elseif ( groups_check_user_has_invite( bp_loggedin_user_id(), $group->id ) ) {
         $request_type = 'accept_invite';
     } elseif ( 'private' === $group->status ) {
@@ -1642 +1642 @@
 
         case 'accept_invite' :
-            if ( ! bp_current_user_can( 'groups_request_membership', array( 'group_id' => $group->id ) ) ) {
-                esc_html_e( 'Error accepting invitation', 'buddypress' );
-            }
-
             check_ajax_referer( 'groups_accept_invite' );
 
@@ -1665 +1661 @@
             check_ajax_referer( 'groups_request_membership' );
 
-            if ( ! groups_send_membership_request( [ 'user_id' => bp_loggedin_user_id(), 'group_id' => $group->id ] ) ) {
+            if ( ! bp_current_user_can( 'groups_request_membership', array( 'group_id' => $group->id ) ) || ! groups_send_membership_request( [ 'user_id' => bp_loggedin_user_id(), 'group_id' => $group->id ] ) ) {
                 esc_html_e( 'Error requesting membership', 'buddypress' );
             } else {