Changeset 12603

Timestamp:

03/29/2020 04:09:52 PM (6 years ago)

Author:

imath

Message:

Send the "email change" confirmation message to the new email

To be consistent with how the email change confirmation message is handled by WordPress, we need to send it to the new email and not to the current email.

Props laudag, espellcaste

Fixes #8138

Location:

trunk/src

Files:

• bp-core/bp-core-functions.php (modified) (1 diff)
• bp-settings/actions/general.php (modified) (1 diff)
• bp-settings/bp-settings-template.php (modified) (1 diff)

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

@@ -3152 +3152 @@
 
     // From, subject, content are set automatically.
-    $email->set_to( $to );
+    if ( 'settings-verify-email-change' === $email_type && isset( $args['tokens']['displayname'] ) ) {
+        $email->set_to( $to, $args['tokens']['displayname'] );
+    } else {
+        $email->set_to( $to );
+    }
+
     $email->set_tokens( $args['tokens'] );
 

trunk/src/bp-settings/actions/general.php

@@ -111 +111 @@
                         ),
                     );
-                    bp_send_email( 'settings-verify-email-change', bp_displayed_user_id(), $args );
+                    bp_send_email( 'settings-verify-email-change', $user_email, $args );
 
                     // We mark that the change has taken place so as to ensure a

trunk/src/bp-settings/bp-settings-template.php

@@ -99 +99 @@
                 /* translators: 1: email address. 2: cancel email change url. */
                 __( 'Check your email (%1$s) for the verification link, or <a href="%2$s">cancel the pending change</a>.', 'buddypress' ),
-                '<code>' . esc_html( bp_get_displayed_user_email() ) . '</code>',
+                '<code>' . esc_html( $pending_email['newemail'] ) . '</code>',
                 esc_url( wp_nonce_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/?dismiss_email_change=1', 'bp_dismiss_email_change' ) )
             );