diff options
| author | Andrey Andreev <narf@devilix.net> | 2013-08-07 13:11:50 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2013-08-07 13:11:50 +0200 |
| commit | fdddb7eb4e73f9ffdbc939bdc6d95f3e8b79117c (patch) | |
| tree | f12bbfca9ea2aa8dcf1a0825b61cd0b9b190477b /system/libraries | |
| parent | dc3ba214cb9d938bb9f310ceaef667af3a34002c (diff) | |
| parent | 7da60d95e077df53ed56460903eb68c20c2eba9f (diff) | |
Merge pull request #2584 from PlamenVasilev/2.1-stable
Suhosin compatible emails
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Email.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index d01d5c197..ebe7fe4d9 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -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; |