summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-11 12:52:39 +0200
committerAndrey Andreev <narf@bofh.bg>2012-10-11 12:52:39 +0200
commit26f0cf9cf94869f9aed94f2a7f5bd4ad9180079e (patch)
tree47219584cf4684972aadc848378c116d201db03e /system
parent782520a60648f40dd10e26f7d073c3670c65c935 (diff)
Add a fallback to imap_8bit() for CI_Email::_prep_quoted_printable()
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Email.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 698cb7679..fa1d5e9bf 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1109,9 +1109,16 @@ class CI_Email {
// However, many developers choose to override that and violate
// the RFC rules due to (apparently) a bug in MS Exchange,
// which only works with "\n".
- if ($this->crlf === "\r\n" && is_php('5.3'))
+ if ($this->crlf === "\r\n")
{
- return quoted_printable_encode($str);
+ if (is_php('5.3'))
+ {
+ return quoted_printable_encode($str);
+ }
+ elseif (function_exists('imap_8bit'))
+ {
+ return imap_8bit($str);
+ }
}
// Reduce multiple spaces & remove nulls