Changeset 8037

Timestamp:

03/04/2014 09:55:52 PM (11 years ago)

Author:

imath

Message:

Set bp_notifications_add_notification() arguments correctly in case of a new_membership_request

The group id needs to be the item_id argument of bp_notifications_add_notification() in case a member requested to join the group. The patch also makes sure the link to the user notification settings page is the one of the administrator of the group in the email sent to inform him of a new membership request.

Fixes #5446

File:

• trunk/bp-groups/bp-groups-notifications.php (modified) (3 diffs)

trunk/bp-groups/bp-groups-notifications.php

@@ -62 +62 @@
         bp_notifications_add_notification( array(
             'user_id'           => $admin_id,
-            'item_id'           => $requesting_user_id,
-            'secondary_item_id' => $group_id,
+            'item_id'           => $group_id,
+            'secondary_item_id' => $requesting_user_id,
             'component_name'    => buddypress()->groups->id,
             'component_action'  => 'new_membership_request'
@@ -72 +72 @@
         return false;
 
+    // Username of the user requesting a membership: %1$s in mail
     $requesting_user_name = bp_core_get_user_displayname( $requesting_user_id );
     $group                = groups_get_group( array( 'group_id' => $group_id ) );
 
+    // Group Administrator user's data
     $ud             = bp_core_get_core_userdata( $admin_id );
     $group_requests = bp_get_group_permalink( $group ) . 'admin/membership-requests';
+
+    // Link to the user's profile who's requesting a membership: %3$s in mail
     $profile_link   = bp_core_get_user_domain( $requesting_user_id );
+
     $settings_slug  = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
-    $settings_link  = bp_core_get_user_domain( $requesting_user_id ) . $settings_slug . '/notifications/';
+    // Link to the group administrator email settings: %s in "disable notifications" part of the email
+    $settings_link  = bp_core_get_user_domain( $admin_id ) . $settings_slug . '/notifications/';
 
     // Set up and send the message
@@ -317 +323 @@
     switch ( $action ) {
         case 'new_membership_request':
-            $group_id = $secondary_item_id;
-            $requesting_user_id = $item_id;
+            $group_id = $item_id;
+            $requesting_user_id = $secondary_item_id;
 
             $group = groups_get_group( array( 'group_id' => $group_id ) );