replace placeholder with empty string if the first or last name is null

Author: petitphp

classes/models/class-member.php

@@ -321,13 +321,8 @@ public function register_notification( $plaintext_pass = '' ) {
 		$message = str_replace( '%%display_name%%', $display_name, $message );
 		$message = str_replace( '%%user_name%%', $username, $message );
 		$message = str_replace( '%%user_email%%', $email, $message );
-
-		if( !empty( $this->first_name ) ) {
-			$message = str_replace( '%%first_name%%', stripslashes( $this->first_name ), $message );
-		}
-		if( !empty( $this->last_name ) ) {
-			$message = str_replace( '%%last_name%%', stripslashes( $this->last_name ), $message );
-		}
+		$message = str_replace( '%%first_name%%', ( !empty( $this->first_name ) ) ? stripslashes( $this->first_name ) : "", $message );
+		$message = str_replace( '%%last_name%%', ( !empty( $this->last_name ) ) ? stripslashes( $this->last_name ) : "", $message );
 
 		foreach( $recipients as $mail ) {
 			// Send mail to admin
@@ -352,13 +347,8 @@ public function register_notification( $plaintext_pass = '' ) {
 		$message = str_replace( '%%user_email%%', $email, $message );
 		$message = str_replace( '%%user_password%%', $plaintext_pass, $message );
 		$message = str_replace( '%%login_url%%', mpt_get_login_permalink( ), $message );
-
-		if( !empty( $this->first_name ) ) {
-			$message = str_replace( '%%first_name%%', stripslashes( $this->first_name ), $message );
-		}
-		if( !empty( $this->last_name ) ) {
-			$message = str_replace( '%%last_name%%', stripslashes( $this->last_name ), $message );
-		}
+		$message = str_replace( '%%first_name%%', ( !empty( $this->first_name ) ) ? stripslashes( $this->first_name ) : "", $message );
+		$message = str_replace( '%%last_name%%', ( !empty( $this->last_name ) ) ? stripslashes( $this->last_name ) : "", $message );
 
 		// Allow plugins hooks
 		$subject = apply_filters( 'mpt_register_notification_subject', $subject, $this );
@@ -404,13 +394,8 @@ public function register_validation_notification( $key ) {
 		$message = str_replace( '%%user_name%%', $username, $message );
 		$message = str_replace( '%%site_url%%', network_site_url( ), $message );
 		$message = str_replace( '%%confirm_register_link%%', ''.add_query_arg( array( 'mpt-action' => 'validation-member-registration', 'ID' => $this->id, 'key' => $key ), mpt_get_registration_permalink() ). '' , $message );
-
-		if( !empty( $this->first_name ) ) {
-			$message = str_replace( '%%first_name%%', stripslashes( $this->first_name ), $message );
-		}
-		if( !empty( $this->last_name ) ) {
-			$message = str_replace( '%%last_name%%', stripslashes( $this->last_name ), $message );
-		}
+		$message = str_replace( '%%first_name%%', ( !empty( $this->first_name ) ) ? stripslashes( $this->first_name ) : "", $message );
+		$message = str_replace( '%%last_name%%', ( !empty( $this->last_name ) ) ? stripslashes( $this->last_name ) : "", $message );
 
 		// Allow plugins hooks
 		$subject = apply_filters( 'mpt_register_validation_notification_subject', $subject, $this );