summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2008-11-06 17:50:38 +0000
committeralecpl <alec@alec.pl>2008-11-06 17:50:38 +0000
commit68af648117f563311c717b5a086df0ae2e5c538f (patch)
tree9749847e88d63ebac662ac45cc991287e403d935
parenta6ebd304e3322ee8c125e5ef8dfd19e30a9d4ebd (diff)
- Fix empty file sending (#1485389)
-rw-r--r--CHANGELOG4
-rw-r--r--program/lib/Mail/mimePart.php4
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index dbd401991..230f3849c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
CHANGELOG RoundCube Webmail
---------------------------
+2008/11/06 (alec)
+----------
+- Fix empty file sending (#1485389)
+
2008/11/05 (alec)
----------
- Fix HTML editor initialization on IE (#1485304)
diff --git a/program/lib/Mail/mimePart.php b/program/lib/Mail/mimePart.php
index 9b9f26cc3..ab7dda30f 100644
--- a/program/lib/Mail/mimePart.php
+++ b/program/lib/Mail/mimePart.php
@@ -257,8 +257,8 @@ class Mail_mimePart {
}
$encoded['body'] = '--' . $boundary . MAIL_MIMEPART_CRLF .
- rtrim(implode('--' . $boundary . MAIL_MIMEPART_CRLF , $subparts), MAIL_MIMEPART_CRLF) . MAIL_MIMEPART_CRLF .
- '--' . $boundary.'--' . MAIL_MIMEPART_CRLF;
+ implode('--' . $boundary . MAIL_MIMEPART_CRLF , $subparts) .
+ '--' . $boundary.'--' . MAIL_MIMEPART_CRLF;
} else {
$encoded['body'] = $this->_getEncodedData($this->_body, $this->_encoding);