From 9843dc77fa397fa4120f3cc975a2fa0b17809fc0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 17 May 2012 03:07:22 -0400
Subject: [PATCH] Mail_Mime 1.8.4
---
program/lib/Mail/mime.php | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/program/lib/Mail/mime.php b/program/lib/Mail/mime.php
index cc72f5b..a7dfa6d 100644
--- a/program/lib/Mail/mime.php
+++ b/program/lib/Mail/mime.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
*
* This class is based on HTML Mime Mail class from
@@ -89,7 +89,7 @@
* @author Sean Coates <sean@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_mime
@@ -387,6 +387,7 @@
* @param string $description Content-Description header
* @param string $h_charset The character set of the headers e.g. filename
* If not specified, $charset will be used
+ * @param array $add_headers Additional part headers
*
* @return mixed True on success or PEAR_Error object
* @access public
@@ -403,7 +404,8 @@
$n_encoding = null,
$f_encoding = null,
$description = '',
- $h_charset = null
+ $h_charset = null,
+ $add_headers = array()
) {
$bodyfile = null;
@@ -442,6 +444,7 @@
'location' => $location,
'disposition' => $disposition,
'description' => $description,
+ 'add_headers' => $add_headers,
'name_encoding' => $n_encoding,
'filename_encoding' => $f_encoding,
'headers_charset' => $h_charset,
@@ -679,6 +682,9 @@
}
if (!empty($value['description'])) {
$params['description'] = $value['description'];
+ }
+ if (is_array($value['add_headers'])) {
+ $params['headers'] = $value['add_headers'];
}
$ret = $obj->addSubpart($value['body'], $params);
@@ -1319,7 +1325,8 @@
*/
function encodeHeader($name, $value, $charset, $encoding)
{
- return Mail_mimePart::encodeHeader(
+ $mime_part = new Mail_mimePart;
+ return $mime_part->encodeHeader(
$name, $value, $charset, $encoding, $this->_build_params['eol']
);
}
--
Gitblit v1.9.1