Changeset 12434

Timestamp:

08/12/2019 08:44:13 PM (6 years ago)

Author:

dcavins

Message:

Invitations: Add support for messages.

• Add the optional user message to the email output notifying group admins and invitees that a request has been extended to them.
• In BP Nouveau, capture any passed message and insert it as part of the invitation creation process.

See #6210.

Location:

trunk/src

Files:

• bp-core/bp-core-functions.php (modified) (2 diffs)
• bp-templates/bp-nouveau/includes/groups/ajax.php (modified) (1 diff)

trunk/src/bp-core/bp-core-functions.php

@@ -3480 +3480 @@
             'post_title'   => __( '[{{{site.name}}}] You have an invitation to the group: "{{group.name}}"', 'buddypress' ),
             /* translators: do not remove {} brackets or translate its contents. */
-            'post_content' => __( "<a href=\"{{{inviter.url}}}\">{{inviter.name}}</a> has invited you to join the group: &quot;{{group.name}}&quot;.\n<a href=\"{{{invites.url}}}\">Go here to accept your invitation</a> or <a href=\"{{{group.url}}}\">visit the group</a> to learn more.", 'buddypress' ),
+            'post_content' => __( "<a href=\"{{{inviter.url}}}\">{{inviter.name}}</a> has invited you to join the group: &quot;{{group.name}}&quot;.\n{{invite.message}}\n<a href=\"{{{invites.url}}}\">Go here to accept your invitation</a> or <a href=\"{{{group.url}}}\">visit the group</a> to learn more.", 'buddypress' ),
             /* translators: do not remove {} brackets or translate its contents. */
             'post_excerpt' => __( "{{inviter.name}} has invited you to join the group: \"{{group.name}}\".\n\nTo accept your invitation, visit: {{{invites.url}}}\n\nTo learn more about the group, visit: {{{group.url}}}.\nTo view {{inviter.name}}'s profile, visit: {{{inviter.url}}}", 'buddypress' ),
@@ -3496 +3496 @@
             'post_title'   => __( '[{{{site.name}}}] Membership request for group: {{group.name}}', 'buddypress' ),
             /* translators: do not remove {} brackets or translate its contents. */
-            'post_content' => __( "<a href=\"{{{profile.url}}}\">{{requesting-user.name}}</a> wants to join the group &quot;{{group.name}}&quot;. As you are an administrator of this group, you must either accept or reject the membership request.\n\n<a href=\"{{{group-requests.url}}}\">Go here to manage this</a> and all other pending requests.", 'buddypress' ),
+            'post_content' => __( "<a href=\"{{{profile.url}}}\">{{requesting-user.name}}</a> wants to join the group &quot;{{group.name}}&quot;.\n {{request.message}}\n As you are an administrator of this group, you must either accept or reject the membership request.\n\n<a href=\"{{{group-requests.url}}}\">Go here to manage this</a> and all other pending requests.", 'buddypress' ),
             /* translators: do not remove {} brackets or translate its contents. */
             'post_excerpt' => __( "{{requesting-user.name}} wants to join the group \"{{group.name}}\". As you are the administrator of this group, you must either accept or reject the membership request.\n\nTo manage this and all other pending requests, visit: {{{group-requests.url}}}\n\nTo view {{requesting-user.name}}'s profile, visit: {{{profile.url}}}", 'buddypress' ),

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

@@ -398 +398 @@
                     'user_id'  => $user_id,
                     'group_id' => $group_id,
+                    'content'  => $_POST['message'],
                 )
             );