summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorBruno Barão <brunobarao@gmail.com>2012-08-14 19:40:18 +0200
committerBruno Barão <brunobarao@gmail.com>2012-08-14 19:40:18 +0200
commitb453e16668c70b0eb02b5ae69cd3196d735421f8 (patch)
tree5f03054caf073c708ae3f211e77c4fd9a1c03f51 /system/libraries
parent327e5c950306087e037c5669c9c36f288c7d8d35 (diff)
Fix email headers when using long email subjects and \r\n as crlf.
Diffstat (limited to 'system/libraries')
-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 8fd7a79e7..b922cb1c0 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1228,7 +1228,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('/^(.*?)(\n|\r)*$/m', ' =?'.$this->charset.'?Q?$1?=$2', $output.$temp));
}
// --------------------------------------------------------------------