Ticket #8139: 8139.06.companion.patch

src/bp-core/bp-core-filters.php

@@ -1074 +1074 @@
                         'user_id'           => $user_id,
                         'notification_type' => $email->get( 'type' ),
                 );
-                // If this email is not to a current member, include the nonmember's email address.
+
+                // If this email is not to a current member, include the nonmember's email address and the Inviter ID.
                 if ( ! $user_id ) {
                         $args['email_address'] = $tokens['recipient.email'];
+                        $args['member_id']     = bp_loggedin_user_id();
                 }
 
                 $link = bp_email_get_unsubscribe_link( $args );

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

@@ -4027 +4027 @@
                 'description'   => __( 'A site member has sent a site invitation to the recipient.', 'buddypress' ),
                 'unsubscribe'   => array(
                         'meta_key'      => 'notification_bp_members_invite',
-                        'message'       => __( 'You will no longer receive emails when you are invited to join a site.', 'buddypress' ),
+                        'message'       => __( 'You will no longer receive emails when you are invited to join this site.', 'buddypress' ),
                 ),
         );
 
@@ -4071 +4071 @@
         $raw_user_id    = ! empty( $_GET['uid'] ) ? absint( $_GET['uid'] ) : 0;
         $raw_user_email = ! empty( $_GET['uem'] ) ? $_GET['uem'] : '';
         $raw_member_id  = ! empty( $_GET['mid'] ) ? absint( $_GET['mid'] ) : 0;
+        $redirect_to    = '';
 
         $new_hash = '';
         if ( ! empty( $raw_user_id ) ) {
@@ -4116 +4117 @@
                         'email_type'    => $raw_email_type,
                         'date_modified' => bp_core_current_time(),
                 );
-                $result      = bp_add_optout( $optout_args );
-                $redirect_to = home_url();
-                $result_msg  = $emails[ $raw_email_type ]['unsubscribe']['message'];
-                $unsub_msg   = __( 'You have been unsubscribed.', 'buddypress' );
+                $result     = bp_add_optout( $optout_args );
+                $result_msg = $emails[ $raw_email_type ]['unsubscribe']['message'];
+                $unsub_msg  = __( 'You have been unsubscribed.', 'buddypress' );
 
         // This is an unsubscribe request from a current member.
         } else {
@@ -4141 +4141 @@
                 $unsub_msg  = __( 'You can change this or any other email notification preferences in your email settings.', 'buddypress' );
         }
 
-        $message = sprintf(
-                '%1$s <a href="%2$s">%3$s</a>',
-                $result_msg,
-                esc_url( $redirect_to ),
-                esc_html( $unsub_msg )
-        );
+        if ( $raw_user_id && $redirect_to ) {
+                $message = sprintf(
+                        '%1$s <a href="%2$s">%3$s</a>',
+                        $result_msg,
+                        esc_url( $redirect_to ),
+                        esc_html( $unsub_msg )
+                );
 
-        bp_core_add_message( $message );
+                // Template notices are only displayed on BP pages.
+                bp_core_add_message( $message );
+                bp_core_redirect( bp_core_get_user_domain( $raw_user_id ) );
 
-        $page_redirect = '';
-        if ( $raw_user_id  ) {
-                $page_redirect = bp_core_get_user_domain( $raw_user_id );
+                exit;
+        } else {
+                wp_die(
+                        sprintf( '%1$s %2$s', esc_html( $unsub_msg ), esc_html( $result_msg ) ),
+                        esc_html( $unsub_msg ),
+                        array(
+                                'link_url'  => home_url(),
+                                'link_text' => __( 'Go to website\'s home page.', 'buddypress' ),
+                        )
+                );
         }
-
-        bp_core_redirect( $page_redirect );
-
-        exit;
 }
 
 /**