From 982bd838bf2b8e8add559744f19ba65d397e51d1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 2 Mar 2021 13:20:41 +0300 Subject: use orm when setting personal data; fix some warnings in mailer class --- classes/mailer.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'classes/mailer.php') diff --git a/classes/mailer.php b/classes/mailer.php index a4270ba88..968caf54a 100644 --- a/classes/mailer.php +++ b/classes/mailer.php @@ -10,11 +10,10 @@ class Mailer { $to_address = $params["to_address"]; $subject = $params["subject"]; $message = $params["message"]; - $message_html = $params["message_html"]; - $from_name = $params["from_name"] ? $params["from_name"] : Config::get(Config::SMTP_FROM_NAME); - $from_address = $params["from_address"] ? $params["from_address"] : Config::get(Config::SMTP_FROM_ADDRESS); - - $additional_headers = $params["headers"] ? $params["headers"] : []; + $message_html = $params["message_html"] ?? ""; + $from_name = $params["from_name"] ?? Config::get(Config::SMTP_FROM_NAME); + $from_address = $params["from_address"] ?? Config::get(Config::SMTP_FROM_ADDRESS); + $additional_headers = $params["headers"] ?? []; $from_combined = $from_name ? "$from_name <$from_address>" : $from_address; $to_combined = $to_name ? "$to_name <$to_address>" : $to_address; -- cgit v1.2.3-54-g00ecf