From a7efdd7c5d606fb91c75132dd1085d685a908b01 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 06 Aug 2015 08:15:10 -0400
Subject: [PATCH] Make Mail_mime>=1.9.0 a requirement, fix compat. errors
---
program/lib/Roundcube/rcube.php | 21 ++++++---------------
INSTALL | 2 +-
composer.json-dist | 2 +-
3 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/INSTALL b/INSTALL
index a894370..0f1e864 100644
--- a/INSTALL
+++ b/INSTALL
@@ -16,7 +16,7 @@
- PHP Data Objects (PDO) with driver for either MySQL, PostgreSQL or SQLite (required)
- Libiconv, Zip, Fileinfo (recommended)
* PEAR packages distributed with Roundcube or external:
- - Mail_Mime 1.8.1 or newer
+ - Mail_Mime 1.9.0 or newer
- Net_SMTP (latest from https://github.com/pear/Net_SMTP/)
- Net_IDNA2 0.1.1 or newer
- Auth_SASL 1.0.6 or newer
diff --git a/composer.json-dist b/composer.json-dist
index 235a3ee..8f2b7d2 100644
--- a/composer.json-dist
+++ b/composer.json-dist
@@ -22,7 +22,7 @@
"pear-pear.php.net/auth_sasl": ">=1.0.6",
"pear-pear.php.net/net_idna2": ">=0.1.1",
"pear-pear.php.net/net_sieve": ">=1.3.2",
- "pear/mail_mime": ">=1.8.9",
+ "pear/mail_mime": ">=1.9.0",
"pear/net_smtp": "dev-master"
},
"require-dev": {
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index 8f75f8c..7452287 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -1559,12 +1559,8 @@
if (strlen($headers['Bcc']))
$a_recipients[] = $headers['Bcc'];
- // clean Bcc from header for recipients
- $send_headers = $headers;
- unset($send_headers['Bcc']);
- // here too, it because txtHeaders() below use $message->_headers not only $send_headers
- unset($message->_headers['Bcc']);
-
+ // remove Bcc header and get the whole head of the message as string
+ $send_headers = array('Bcc' => null);
$smtp_headers = $message->txtHeaders($send_headers, true);
if ($message->getParam('delay_file_io')) {
@@ -1606,13 +1602,9 @@
// send mail using PHP's mail() function
else {
// unset some headers because they will be added by the mail() function
- $headers_enc = $message->headers($headers);
- $headers_php = $message->_headers;
- unset($headers_php['To'], $headers_php['Subject']);
-
- // reset stored headers and overwrite
- $message->_headers = array();
- $header_str = $message->txtHeaders($headers_php);
+ $headers_enc = $headers;
+ $headers_res = array('To' => null, 'Subject' => null);
+ $header_str = $message->txtHeaders($headers_res, true);
// #1485779
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
@@ -1685,8 +1677,7 @@
fclose($msg_body);
}
- $message->_headers = array();
- $message->headers($headers);
+ $message->headers($headers, true);
return $sent;
}
--
Gitblit v1.9.1