root

Changeset 710

Show
Ignore:
Timestamp:
10/05/09 14:23:45 (10 months ago)
Author:
wbond
Message:

Removed duplicate MIME-Version headers that were being included by fEmail with S/MIME encrypted emails

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • fEmail.php

    r701 r710 Hide Line Numbers
    1717 * @link       http://flourishlib.com/fEmail 
    1818 *  
    19  * @version    1.0.0b11 
     19 * @version    1.0.0b12 
     20 * @changes    1.0.0b12  Removed duplicate MIME-Version headers that were being included in S/MIME encrypted emails [wb, 2009-10-05] 
    2021 * @changes    1.0.0b11  Updated to use the new fValidationException API [wb, 2009-09-17] 
    2122 * @changes    1.0.0b10  Fixed a bug with sending both an HTML and a plaintext body [bb-imarc, 2009-06-18] 
    …… 
    748749        $new_headers = preg_replace('#^To:[^\n]+\n( [^\n]+\n)*#mi', '', $new_headers); 
    749750        $new_headers = preg_replace('#^Subject:[^\n]+\n( [^\n]+\n)*#mi', '', $new_headers); 
     751        $new_headers = preg_replace("#^MIME-Version: 1.0\r?\n#mi", '', $new_headers, 1); 
    750752        $new_headers = preg_replace('#^Content-Type:\s+' . preg_quote($headers_array['Content-Type'], '#') . "\r?\n#mi", '', $new_headers); 
    751753        $new_headers = preg_replace('#^Content-Transfer-Encoding:\s+' . preg_quote($headers_array['Content-Transfer-Encoding'], '#') . "\r?\n#mi", '', $new_headers);