summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-06-25 11:22:37 +0200
committerAndrey Andreev <narf@devilix.net>2013-06-25 11:22:37 +0200
commitb9e090e5f4ddb72aef6cf7f36cb17b842885d53e (patch)
tree6bc5f1e60b78bcf27451df84cd3e3e68253acdd6 /system
parent4a7310ec6e0c6b9e23bd4ff9450d8bfd04e567ea (diff)
parent8094452263bfa158316dccbfd5b03c8f2bfb564d (diff)
Merge pull request #2480 from florisluiten/develop
Prevent email header injection
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Email.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 0c83a8ba9..11ee29041 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -739,7 +739,7 @@ class CI_Email {
*/
public function set_header($header, $value)
{
- $this->_headers[$header] = $value;
+ $this->_headers[$header] = str_replace(array("\n", "\r"), '', $value);
}
// --------------------------------------------------------------------