diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-05-17 18:59:19 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-05-17 18:59:19 +0200 |
| commit | 9603477e958e231c14e57380a1861454da17c2a0 (patch) | |
| tree | 74f6c0b5500a8fcd473c21d7efa6c7c08e581d67 /program/lib/Mail/mimePart.php | |
| parent | 3983f50635ccf2a25a8bbb2c938f082a83c209d3 (diff) | |
| parent | eebd4476fc9bba486068df1da5ef118e7a57439a (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/lib/Mail/mimePart.php')
| -rw-r--r-- | program/lib/Mail/mimePart.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/program/lib/Mail/mimePart.php b/program/lib/Mail/mimePart.php index 821990ee0..f3cd98e6d 100644 --- a/program/lib/Mail/mimePart.php +++ b/program/lib/Mail/mimePart.php @@ -48,7 +48,7 @@ * @author Aleksander Machniak <alec@php.net> * @copyright 2003-2006 PEAR <pear-group@php.net> * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version CVS: $Id$ + * @version 1.8.4 * @link http://pear.php.net/package/Mail_mime */ @@ -70,7 +70,7 @@ * @author Aleksander Machniak <alec@php.net> * @copyright 2003-2006 PEAR <pear-group@php.net> * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version Release: @package_version@ + * @version Release: 1.8.4 * @link http://pear.php.net/package/Mail_mime */ class Mail_mimePart @@ -156,6 +156,7 @@ class Mail_mimePart * headers_charset - Charset of the headers e.g. filename, description. * If not set, 'charset' will be used * eol - End of line sequence. Default: "\r\n" + * headers - Hash array with additional part headers * body_file - Location of file with part's body (instead of $body) * * @access public @@ -168,6 +169,11 @@ class Mail_mimePart $this->_eol = MAIL_MIMEPART_CRLF; } + // Additional part headers + if (!empty($params['headers']) && is_array($params['headers'])) { + $headers = $params['headers']; + } + foreach ($params as $key => $value) { switch ($key) { case 'encoding': |