diff options
| author | Florian Pritz <bluewind@xinu.at> | 2014-06-06 23:08:59 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2014-06-06 23:08:59 +0200 |
| commit | 77f15dc6ba5d3308d42e8f75103c3193d3796dd2 (patch) | |
| tree | 7e1a86f8b0ff954780a28bdea6c956649cf36d57 /system/libraries/Email.php | |
| parent | 110b467503f7a749aec685be445468c0f98b9e2a (diff) | |
| parent | 916b176594bcf175417423f33711ac0cbb4082e7 (diff) | |
Merge remote-tracking branch 'remotes/upstream/2.2-stable' into working
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Conflicts:
system/libraries/Session.php
user_guide/
Diffstat (limited to 'system/libraries/Email.php')
| -rw-r--r-- | system/libraries/Email.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index d01d5c197..10cbc346d 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -6,7 +6,7 @@ * * @package CodeIgniter * @author ExpressionEngine Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. * @license http://codeigniter.com/user_guide/license.html * @link http://codeigniter.com * @since Version 1.0 @@ -1032,7 +1032,7 @@ class CI_Email { if ($this->_get_protocol() == 'mail') { - $this->_header_str .= $hdr; + $this->_header_str .= rtrim($hdr); $this->_finalbody = $this->_body; } else @@ -1070,7 +1070,7 @@ class CI_Email { if ($this->_get_protocol() == 'mail') { - $this->_header_str .= $hdr; + $this->_header_str .= rtrim($hdr); } else { @@ -1092,7 +1092,7 @@ class CI_Email { if ($this->_get_protocol() == 'mail') { - $this->_header_str .= $hdr; + $this->_header_str .= rtrim($hdr); } $body .= $this->_get_mime_message() . $this->newline . $this->newline; @@ -1110,7 +1110,7 @@ class CI_Email { if ($this->_get_protocol() == 'mail') { - $this->_header_str .= $hdr; + $this->_header_str .= rtrim($hdr); } $body .= $this->_get_mime_message() . $this->newline . $this->newline; |