summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-08 19:43:18 +0200
committerAndrey Andreev <narf@bofh.bg>2012-10-08 19:43:18 +0200
commit60e719bd73cb490cc5c6c2df51823d06c00e973f (patch)
tree8e7121bb64374f37c1edb304284369ab764e867f /system/libraries
parent960e616d18c77f463e7c53f666d98b09f5ca9057 (diff)
parent51f72cda43e4f7aa9cafbf31181e67c31936a0bd (diff)
Merge pull request #1709 from bbarao/develop
Fix email headers when using long email subjects and \r\n as crlf.
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Email.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 4776df498..4adf9430f 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1237,7 +1237,7 @@ class CI_Email {
// wrap each line with the shebang, charset, and transfer encoding
// the preceding space on successive lines is required for header "folding"
- return trim(preg_replace('/^(.*)$/m', ' =?'.$this->charset.'?Q?$1?=', $output.$temp));
+ return trim(preg_replace('/^(.*?)(\r*)$/m', ' =?'.$this->charset.'?Q?$1?=$2', $output.$temp));
}
// --------------------------------------------------------------------
@@ -1861,4 +1861,4 @@ class CI_Email {
}
/* End of file Email.php */
-/* Location: ./system/libraries/Email.php */ \ No newline at end of file
+/* Location: ./system/libraries/Email.php */