Ticket #4731: 4731-2.diff

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

@@ -356 +356 @@
         $activate_url = esc_url( $activate_url );
 
         // Email contents
-        $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%1\$s\n\n", 'buddypress' ), $activate_url );
+        $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%1\$s\n\nYour username is: %2\$s", 'buddypress' ), $activate_url, $user );
         $subject = bp_get_email_subject( array( 'text' => __( 'Activate Your Account', 'buddypress' ) ) );
 
         // Email filters

src/bp-members/bp-members-functions.php

@@ -1946 +1946 @@
         $activate_url = bp_get_activation_page() ."?key=$key";
         $activate_url = esc_url( $activate_url );
 
-        $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%1\$s\n\n", 'buddypress' ), $activate_url );
+        $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%1\$s\n\nYour username is: %2\$s", 'buddypress' ), $activate_url, get_userdata( $user_id )->user_login );
         $subject = bp_get_email_subject( array( 'text' => __( 'Activate Your Account', 'buddypress' ) ) );
 
         // Send the message