Ticket #2404: 2404.001.diff

bp-core/bp-core-signup.php

@@ -532 +532 @@
 function bp_core_signup_send_validation_email( $user_id, $user_email, $key ) {
         $activate_url = bp_get_activation_page() ."?key=$key";
         $activate_url = clean_url( $activate_url );
-        $admin_email = get_site_option( "admin_email" );
 
-        if ( empty( $admin_email ) )
-                $admin_email = 'noreply@' . $_SERVER['SERVER_NAME'];
-
-        $from_name = ( '' == get_option( 'blogname' ) ) ? 'BuddyPress' : wp_specialchars( get_option( 'blogname' ) );
-        $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option( 'blog_charset' ) . "\"\n";
         $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n", 'buddypress' ), $activate_url );
         $subject = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
 
         /* Send the message */
-        $to = apply_filters( 'bp_core_activation_signup_user_notification_to', $user_email );
-        $subject = apply_filters( 'bp_core_activation_signup_user_notification_subject', $subject );
-        $message = apply_filters( 'bp_core_activation_signup_user_notification_message', $message );
+        $to = apply_filters( 'bp_core_signup_send_validation_email_to', $user_email );
+        $subject = apply_filters( 'bp_core_signup_send_validation_email_subject', $subject );
+        $message = apply_filters( 'bp_core_signup_send_validation_email_message', $message, $user_id, $activate_url );
 
         wp_mail( $to, $subject, $message, $message_headers );
 }