diff options
| author | fisharebest <fisharebest@gmail.com> | 2011-12-08 20:36:46 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2011-12-08 20:36:46 +0000 |
| commit | 10eab7014f9c8ee49d66de8ed936cf9cef888f20 (patch) | |
| tree | a98f5d44d081851a3e4682a32c2c949a4d766b03 /includes/functions/functions_mail.php | |
| parent | 7f698d9b8a8f261990752d261463ed2fdf4b7689 (diff) | |
| download | webtrees-10eab7014f9c8ee49d66de8ed936cf9cef888f20.tar.gz webtrees-10eab7014f9c8ee49d66de8ed936cf9cef888f20.tar.bz2 webtrees-10eab7014f9c8ee49d66de8ed936cf9cef888f20.zip | |
#899773 - Admin mail config help messages wrong
Remove "simple mail headers" option.
Diffstat (limited to 'includes/functions/functions_mail.php')
| -rw-r--r-- | includes/functions/functions_mail.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/includes/functions/functions_mail.php b/includes/functions/functions_mail.php index ac4717d5b2..b92d64e7b8 100644 --- a/includes/functions/functions_mail.php +++ b/includes/functions/functions_mail.php @@ -139,14 +139,12 @@ function webtreesMail($to, $from, $subject, $message) { $mail_object->SMTPSecure = 'tls'; } $from_name = ''; - if (!get_site_setting('SMTP_SIMPLE_MAIL')) { - preg_match('/<(.*)>/', $to, $matches); - if (isset($matches[1])) $to = $matches[1]; - preg_match('/<(.*)>/', $from, $matches); - if (isset($matches[1])) { - if (($pos = strpos($from, '<')) !== false) $from_name = substr($from, 0, $pos); - $from = $matches[1]; - } + preg_match('/<(.*)>/', $to, $matches); + if (isset($matches[1])) $to = $matches[1]; + preg_match('/<(.*)>/', $from, $matches); + if (isset($matches[1])) { + if (($pos = strpos($from, '<')) !== false) $from_name = substr($from, 0, $pos); + $from = $matches[1]; } $mail_object->SetFrom($from, $from_name); if ((!empty($SMTP_FROM_NAME) && $from!=$SMTP_AUTH_USER) || !empty($from_name)) { |