malhuda/CodeIgniter4
1
0
Fork 0
mirror of https://github.com/codeigniter4/CodeIgniter4.git synced 2025-02-20 11:44:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix property violation

Browse Source
This commit is contained in:
MGatner 2020-06-23 18:19:00 +00:00
parent fdc1b8295a
commit 37460f7bde
No known key found for this signature in database
GPG Key ID: 9CA44105713F5A12
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
system/Email/Email.php
View File

@ -1727,20 +1727,18 @@ class Email
*/
protected function sendWithMail()
{
if (is_array($this->recipients))
{
$this->recipients = implode(', ', $this->recipients);
}
$recipients = is_array($this->recipients) ? implode(', ', $this->recipients) : $this->recipients;
// _validate_email_for_shell() below accepts by reference,
// so this needs to be assigned to a variable
$from = $this->cleanEmail($this->headers['Return-Path']);
if (! $this->validateEmailForShell($from))
{
return mail($this->recipients, $this->subject, $this->finalBody, $this->headerStr);
return mail($recipients, $this->subject, $this->finalBody, $this->headerStr);
}
// most documentation of sendmail using the "-f" flag lacks a space after it, however
// we've encountered servers that seem to require it to be in place.
return mail($this->recipients, $this->subject, $this->finalBody, $this->headerStr, '-f ' . $from);
return mail($recipients, $this->subject, $this->finalBody, $this->headerStr, '-f ' . $from);
}
//--------------------------------------------------------------------
/**