Add checks for email subject and body before sending (#7881)

core/users/user_edit.php

@@ -592,11 +592,13 @@
 					}
 					unset($sql, $parameters, $row);
 
+					if (!empty($email_subject) && !empty($email_body)) {
 						//replace variables in email body
 						$email_body = str_replace('${domain}', $domain_name, $email_body);
 
 						//send the email
 						send_email($user_email, $email_subject, $email_body, $eml_error);
+					}
 
 					//build the user log array
 					$log_array['type'] = 'Password Changed';

core/users/user_profile.php

@@ -456,11 +456,13 @@
 					}
 					unset($sql, $parameters, $row);
 
+					if (!empty($email_subject) && !empty($email_body)) {
 						//replace variables in email body
 						$email_body = str_replace('${domain}', $domain_name, $email_body);
 
 						//send the email
 						send_email($user_email, $email_subject, $email_body, $eml_error);
+					}
 
 					//get the username
 					$sql = "select username from v_users ";