Changeset 10606

Timestamp:

02/17/2016 01:03:18 AM (11 years ago)

Author:

dcavins

Message:

BP Email: Fix tokens for group invite email.

• Make sure that the group

invitation-related actions
are referring to the
correct tokens.

• Include the ID of the

inviter for use in the
deprecated actions.

Location:

trunk/src

Files:

• bp-core/deprecated/2.5.php (modified) (2 diffs)
• bp-groups/bp-groups-notifications.php (modified) (1 diff)

trunk/src/bp-core/deprecated/2.5.php

@@ -480 +480 @@
                          * @param string          $settings_link Removed in 2.5; now an empty string.
                          */
-                        $value = apply_filters_ref_array( 'groups_notification_group_invites_message', array( $value, &$tokens['group'], $tokens['inviter-profile.name'], $tokens['inviter-profile.url'], $tokens['invites.url'], $tokens['group.url'], '' ) );
+                        $value = apply_filters_ref_array( 'groups_notification_group_invites_message', array( $value, &$tokens['group'], $tokens['inviter.name'], $tokens['inviter.url'], $tokens['invites.url'], $tokens['group.url'], '' ) );
                 }
 
@@ -841 +841 @@
                  * @param BP_Groups_Group $group            Group object.
                  */
-                do_action( 'bp_groups_sent_invited_email', $tokens['inviter-profile.id'], $email_subject, $email_content, $tokens['group'] );
+                do_action( 'bp_groups_sent_invited_email', $tokens['inviter.id'], $email_subject, $email_content, $tokens['group'] );
 
         } elseif ( $email_type === 'groups-member-promoted' ) {

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

@@ -285 +285 @@
                         'inviter.name' => bp_core_get_userlink( $inviter_user_id, true, false, true ),
                         'inviter.url'  => bp_core_get_user_domain( $inviter_user_id ),
+                        'inviter.id'   => $inviter_user_id,
                         'invites.url'  => esc_url( $invited_link . '/invites/' ),
                 ),