hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

!286 解决自带Email类发送邮件收件人账号名是数组索引，移除未使用形参 

Merge pull request !286 from Henry/email_bug_revision
pull/286/MERGE
Karson 2021-03-10 11:01:08 +08:00 committed by Gitee
parent 025f37f1f1 5d7181fe1d
commit 6bac3fca8a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/common/library/Email.php
View File

@ -97,10 +97,9 @@ class Email
/** /**
* 设置收件人 * 设置收件人
* @param mixed $email 收件人,多个收件人以,进行分隔 * @param mixed $email 收件人,多个收件人以,进行分隔
* @param string $name 收件人名称
* @return $this * @return $this
*/ */
public function to($email, $name = '') public function to($email)
{ {
$emailArr = $this->buildAddress($email); $emailArr = $this->buildAddress($email);
foreach ($emailArr as $address => $name) { foreach ($emailArr as $address => $name) {
@ -177,7 +176,12 @@ class Email
*/ */
protected function buildAddress($emails) protected function buildAddress($emails)
{ {
$emails = is_array($emails) ? $emails : array_flip(explode(',', str_replace(";", ",", $emails))); if (!is_array($emails)) {
$emails = array_flip(explode(',', str_replace(";", ",", $emails)));
foreach ($emails as $key => $value) {
$emails[$key] = strstr($key, '@', true);
}
}
return $emails; return $emails;
} }