diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-10-09 12:36:31 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-10-09 12:36:31 +0200 |
| commit | ea7a866f6107d4b50b4a7059f1373035aa12dd23 (patch) | |
| tree | bf3c2d9f16d098358108f4ad609cf2b068c45ba6 /system/libraries | |
| parent | 9ac557f2473844f3c2207189f371f827dbaddb71 (diff) | |
| parent | 580fe8ec482f5df7ca5b91e11b13b72a8f3ed0b8 (diff) | |
Merge changes from develop
Diffstat (limited to 'system/libraries')
| -rw-r--r-- | system/libraries/Email.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 4776df498..36bdd1f22 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)); } // -------------------------------------------------------------------- |