Ticket #6744: bp-settings-actions.php.patch

bp-settings-actions.php

@@ -100 +100 @@
 
                                         bp_update_user_meta( bp_displayed_user_id(), 'pending_email_change', $pending_email );
 
+                                        $activation_link = bp_displayed_user_domain() . bp_get_settings_slug() . '/?verify_email_change=' . $hash;
+                                        
                                         $email_text = sprintf(
                                                 __( 'Dear %1$s,
 
@@ -116 +118 @@
 %6$s', 'buddypress' ),
                                                 bp_core_get_user_displayname( bp_displayed_user_id() ),
                                                 bp_get_site_name(),
-                                                esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/?verify_email_change=' . $hash ),
+                                                esc_url( $activation_link ),
                                                 $user_email,
                                                 bp_get_site_name(),
                                                 bp_get_root_domain()
@@ -133 +135 @@
                                          * @param string  $old_user_email Existing email address
                                          *                                for the current user.
                                          * @param WP_User $update_user    Userdata object for the current user.
+                                         * @param string  $activation_link The link to complete the change.
                                          */
-                                        $content = apply_filters( 'bp_new_user_email_content', $email_text, $user_email, $old_user_email, $update_user );
+                                        $content = apply_filters( 'bp_new_user_email_content', $email_text, $user_email, $old_user_email, $update_user, $activation_link );
+                                        
+                                        $email_subject = sprintf( __( '[%s] Verify your new email address', 'buddypress' ), wp_specialchars_decode( bp_get_site_name() ) );
 
+                                        /**
+                                         * Filter the email subject sent when a user changes emails.
+                                         *
+                                         * @since 2.4.1
+                                         *
+                                         * @param string  $email_subject Subject of the email.
+                                         */
+                                        $subject = apply_filters( 'bp_new_user_email_subject', $email_subject );
+
                                         // Send the verification email
-                                        wp_mail( $user_email, sprintf( __( '[%s] Verify your new email address', 'buddypress' ), wp_specialchars_decode( bp_get_site_name() ) ), $content );
+                                        wp_mail( $user_email, $subject, $content );
 
                                         // We mark that the change has taken place so as to ensure a
                                         // success message, even though verification is still required