Merge pull request #37 from petitphp/fix-template-replace

fix bad replace in templates

Author: herewithme

classes/helpers/default-settings.php

@@ -271,7 +271,7 @@
 			'name' => 'registration_member_admin_content',
 			'label' => __( 'Content mail', 'mpt' ),
 			'type' => 'textarea',
-			'default' => __( "New member registration on your site %%blog_name%% :\n\nUsername: %%username%%\nMail: %%user_email%%", 'mpt' ),
+			'default' => __( "New member registration on your site %%blog_name%% :\n\nUsername: %%user_name%%\nMail: %%user_email%%", 'mpt' ),
 			'desc' => __( 'Values ​"​%% %%" will be replaced dynamically sending mail.', 'mpt' ),
 			'sanitize_callback' => 'strip_tags'
 		),
@@ -291,7 +291,7 @@
 			'name' => 'register_member_content',
 			'label' => __( 'Content mail', 'mpt' ),
 			'type' => 'textarea',
-			'default' => __( "Username: %%username%%\nPassword: %%password%%\n\n%%login_url%%", 'mpt' ),
+			'default' => __( "Username: %%user_name%%\nPassword: %%password%%\n\n%%login_url%%", 'mpt' ),
 			'desc' => __( 'Values ​"​%% %%" will be replaced dynamically sending mail.', 'mpt' ),
 			'sanitize_callback' => 'strip_tags'
 		),
@@ -338,7 +338,7 @@
 			'name' => 'lost_password_admin_content',
 			'label' => __( 'Content mail', 'mpt' ),
 			'type' => 'textarea',
-			'default' => __( 'Password Lost and Changed for member: %%username%%', 'mpt' ),
+			'default' => __( 'Password Lost and Changed for member: %%user_name%%', 'mpt' ),
 			'desc' => __( 'Values ​"​%% %%" will be replaced dynamically sending email', 'mpt' ),
 			'sanitize_callback' => 'strip_tags'
 		),
@@ -358,7 +358,7 @@
 			'name' => 'lost_password_member_content',
 			'label' => __( 'Content mail', 'mpt' ),
 			'type' => 'textarea',
-			'default' => __( "Someone requested that the password be reset for the following account:\n\n%%site_url%%\n\nUsername: %%username%%\n\nIf this was a mistake, just ignore this email and nothing will happen.\n\nTo reset your password, visit the following address:\n\n%%reset_pwd_link%%", 'mpt' ),
+			'default' => __( "Someone requested that the password be reset for the following account:\n\n%%site_url%%\n\nUsername: %%user_name%%\n\nIf this was a mistake, just ignore this email and nothing will happen.\n\nTo reset your password, visit the following address:\n\n%%reset_pwd_link%%", 'mpt' ),
 			'desc' => __( 'Values ​"​%% %%" will be replaced dynamically sending email', 'mpt' ),
 			'sanitize_callback' => 'strip_tags'
 		),

classes/models/class-member.php

@@ -263,7 +263,7 @@ public function password_change_notification( ) {
 
 				// Replace with good values
 				$subject = str_replace( '%%blog_name%%', $blogname, $subject );
-				$content = str_replace( '%%username%%', $this->username, $content );
+				$content = str_replace( '%%user_name%%', $this->username, $content );
 
 				wp_mail( stripslashes( $mail ), $subject, $content );
 				return true;
@@ -498,7 +498,7 @@ public function reset_password_link( ) {
 
 		// Build message text
 		$message = str_replace( '%%site_url%%', network_site_url( ), $message );
-		$message = str_replace( '%%username%%', $this->get_display_name( ), $message );
+		$message = str_replace( '%%user_name%%', $this->get_display_name( ), $message );
 		$message = str_replace( '%%reset_pwd_link%%', add_query_arg( array( 'mpt-action' => 'lost-password', 'key' => $key, 'id' => $this->id ), mpt_get_lost_password_permalink( ) ), $message );
 
 		// Allow plugins hooks