From 6a94f69bd1658f47eb705a299623d118e292d482 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 01 Oct 2015 02:34:18 -0400
Subject: [PATCH] Remove code for Mail_mime<1.9, we already require Mail_mime-1.10 for other reasons
---
program/lib/Roundcube/rcube.php | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index 09c8f90..a1773a8 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -1674,18 +1674,10 @@
*/
protected function message_head($message, $unset = array())
{
- // Mail_mime >= 1.9.0
- if (method_exists($message, 'isMultipart')) {
- foreach ($unset as $header) {
- $headers[$header] = null;
- }
- }
- else {
- $headers = $message->headers();
- foreach ($unset as $header) {
- unset($headers[$header]);
- }
- $message->_headers = array();
+ // requires Mail_mime >= 1.9.0
+ $headers = array();
+ foreach ((array) $unset as $header) {
+ $headers[$header] = null;
}
return $message->txtHeaders($headers, true);
--
Gitblit v1.9.1