Browse Source
修复邮件发件人为空问题 (#282)
* 修复数据表格点击重置按钮后不按类型加载数据问题和添加刷新按钮
* 修复邮件发件人为空问题
pull/285/head
小胡
6 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
2 additions and
2 deletions
-
core/function/function_mail.php
|
|
|
@ -43,9 +43,9 @@ EOT; |
|
|
|
$_G['setting']['mail']['mailsend'] = $_G['setting']['mail']['mailsend'] ? $_G['setting']['mail']['mailsend'] : 1; |
|
|
|
|
|
|
|
if($_G['setting']['mail']['mailsend'] == 3) { |
|
|
|
$email_from = empty($from) ? ($_G['setting']['adminemail']?$_G['setting']['adminemail']:$_G['setting']['mail']['from']) : $from; |
|
|
|
$email_from = empty($from) ? $_G['setting']['adminemail'] : $from; |
|
|
|
} else { |
|
|
|
$email_from = $_G['setting']['mail']['from']; |
|
|
|
$email_from = $from == '' ? '=?'.CHARSET.'?B?'.base64_encode($_G['setting']['sitename'])."?= <".$_G['setting']['adminemail'].">" : (preg_match('/^(.+?) \<(.+?)\>$/',$from, $mats) ? '=?'.CHARSET.'?B?'.base64_encode($mats[1])."?= <$mats[2]>" : $from); |
|
|
|
} |
|
|
|
|
|
|
|
$email_to = preg_match('/^(.+?)\s*\<(.+?)\>$/',$toemail, $mats) ? ($mailusername ? '=?'.CHARSET.'?B?'.base64_encode($mats[1])."?= <$mats[2]>" : $mats[2]) : $toemail; |
|
|
|
|
