From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop
---
program/steps/mail/get.inc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 3727577..5fea3c9 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -334,7 +334,7 @@
}
// send part as-it-is
else {
- if ($part->body) {
+ if ($part->body && empty($plugin['download'])) {
header("Content-Length: " . strlen($part->body));
echo $part->body;
$sent = true;
@@ -344,7 +344,7 @@
header("Content-Length: $size");
}
- $sent = $RCMAIL->storage->get_message_part($MESSAGE->uid, $part->mime_id, $part, true);
+ $sent = $RCMAIL->storage->get_message_part($MESSAGE->uid, $part->mime_id, $part, true, null, true);
}
}
--
Gitblit v1.9.1