Use word_separator instead of hard coded trailing space for $s_new_ac…

…count_IP
mantisbt · Jan 25, 2009 · fb7bb7f · fb7bb7f
1 parent 662ed70
commit fb7bb7f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/email_api.php b/core/email_api.php
@@ -459,7 +459,7 @@ function email_send_confirm_hash_url( $p_user_id, $p_confirm_hash ) {
 
 	$t_subject = '[' . config_get( 'window_title' ) . '] ' . lang_get( 'lost_password_subject' );
 
-	$t_message = lang_get( 'reset_request_msg' ) . " \n\n" . string_get_confirm_hash_url( $p_user_id, $p_confirm_hash ) . " \n\n" . lang_get( 'new_account_username' ) . $t_username . " \n" . lang_get( 'new_account_IP' ) . $_SERVER["REMOTE_ADDR"] . " \n\n" . lang_get( 'new_account_do_not_reply' );
+	$t_message = lang_get( 'reset_request_msg' ) . " \n\n" . string_get_confirm_hash_url( $p_user_id, $p_confirm_hash ) . " \n\n" . lang_get( 'new_account_username' ) . $t_username . " \n" . lang_get( 'new_account_IP' ) . lang_get( 'word_separator' ) . $_SERVER["REMOTE_ADDR"] . " \n\n" . lang_get( 'new_account_do_not_reply' );
 
 	# Send password reset regardless of mail notification prefs
 	# or else users won't be able to receive their reset pws
@@ -488,7 +488,7 @@ function email_notify_new_account( $p_username, $p_email ) {
 		$t_recipient_email = user_get_email( $t_user['id'] );
 		$t_subject = '[' . config_get( 'window_title' ) . '] ' . lang_get( 'new_account_subject' );
 
-		$t_message = lang_get( 'new_account_signup_msg' ) . " \n\n" . lang_get( 'new_account_username' ) . $p_username . " \n" . lang_get( 'new_account_email' ) . $p_email . " \n" . lang_get( 'new_account_IP' ) . $_SERVER["REMOTE_ADDR"] . " \n" . $g_path . "\n\n" . lang_get( 'new_account_do_not_reply' );
+		$t_message = lang_get( 'new_account_signup_msg' ) . " \n\n" . lang_get( 'new_account_username' ) . $p_username . " \n" . lang_get( 'new_account_email' ) . $p_email . " \n" . lang_get( 'new_account_IP' ) . lang_get( 'word_separator' ) . $_SERVER["REMOTE_ADDR"] . " \n" . $g_path . "\n\n" . lang_get( 'new_account_do_not_reply' );
 
 		if( !is_blank( $t_recipient_email ) ) {
 			email_store( $t_recipient_email, $t_subject, $t_message );

diff --git a/lang/strings_english.txt b/lang/strings_english.txt
@@ -359,7 +359,7 @@ $s_new_account_username = 'Username: ';
 $s_new_account_message = 'If you did not request any registration, ignore this message and nothing will happen.\n\n';
 $s_new_account_do_not_reply = 'DO NOT REPLY TO THIS MESSAGE';
 $s_new_account_email = 'E-mail: ';
-$s_new_account_IP = 'Remote IP address: ';
+$s_new_account_IP = 'Remote IP address:';
 $s_new_account_signup_msg = 'The following account has been created:';
 
 $s_reset_request_msg = 'Someone (presumably you) requested a password change through e-mail verification. If this was not you, ignore this message and nothing will happen.\n\nIf you requested this verification, visit the following URL to change your password:';