diff options
| author | Andrew Dolgov <[email protected]> | 2021-02-24 21:56:52 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2021-02-24 21:56:52 +0300 |
| commit | 93940d2a9f80d9e1dac49b5eb7db23230d31c5f6 (patch) | |
| tree | 71016661f6017918d0934eb462bd9552018d557a /classes/mailer.php | |
| parent | 8b022c2bfb356d7dddaf334bc931d6dec77086fb (diff) | |
| parent | 1adacd057230aea4ede29dab510385bf01cf99a3 (diff) | |
Merge branch 'master' of git.fakecake.org:fox/tt-rss into weblate-integration
Diffstat (limited to 'classes/mailer.php')
| -rw-r--r-- | classes/mailer.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/mailer.php b/classes/mailer.php index 16be16523..93f778210 100644 --- a/classes/mailer.php +++ b/classes/mailer.php @@ -11,15 +11,15 @@ class Mailer { $subject = $params["subject"]; $message = $params["message"]; $message_html = $params["message_html"]; - $from_name = $params["from_name"] ? $params["from_name"] : SMTP_FROM_NAME; - $from_address = $params["from_address"] ? $params["from_address"] : SMTP_FROM_ADDRESS; + $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"] : []; $from_combined = $from_name ? "$from_name <$from_address>" : $from_address; $to_combined = $to_name ? "$to_name <$to_address>" : $to_address; - if (defined('_LOG_SENT_MAIL') && _LOG_SENT_MAIL) + if (Config::get(Config::LOG_SENT_MAIL)) Logger::get()->log(E_USER_NOTICE, "Sending mail from $from_combined to $to_combined [$subject]: $message"); // HOOK_SEND_MAIL plugin instructions: |