From 5edca4f4d3fd9894855bf5d271a2ee00cefebdab Mon Sep 17 00:00:00 2001 From: David Flatz Date: Mon, 8 Feb 2016 19:09:52 +0100 Subject: encode header with base64 when quoted-printable fails because of php bug #53891 --- it_mail.class | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'it_mail.class') diff --git a/it_mail.class b/it_mail.class index aa242c5..6c4398f 100644 --- a/it_mail.class +++ b/it_mail.class @@ -305,7 +305,12 @@ function send($p = array()) function header_escape($string) { return preg_match('/[\x00-\x1f\x7f-\xff]/', $string) - ? ltrim(iconv_mime_encode('', $string, array('scheme' => 'Q', 'input-charset' => $this->charset, 'output-charset' => $this->charset)), ' :') + ? ltrim( + ($encoded = @iconv_mime_encode('', $string, array('scheme' => 'Q', 'input-charset' => $this->charset, 'output-charset' => $this->charset))) !== false + ? $encoded + : iconv_mime_encode('', $string, array('scheme' => 'B', 'input-charset' => $this->charset, 'output-charset' => $this->charset)), + ' :' + ) : $string; } -- cgit v1.2.3