summaryrefslogtreecommitdiff
path: root/roundcubemail
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-11-06 17:50:38 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-11-06 17:50:38 +0000
commit46d78d9b8b95b9933cd902b7185b551c52b2b470 (patch)
tree89f33debc8d77da2255c4a67cf645f3720fab7b1 /roundcubemail
parent1ccd6a7e81d1b5b21e3847511c02de061b2668ad (diff)
- Fix empty file sending (#1485389)
git-svn-id: https://svn.roundcube.net/trunk@2043 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
-rw-r--r--roundcubemail/CHANGELOG4
-rw-r--r--roundcubemail/program/lib/Mail/mimePart.php4
2 files changed, 6 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index dbd401991..230f3849c 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/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/roundcubemail/program/lib/Mail/mimePart.php b/roundcubemail/program/lib/Mail/mimePart.php
index 9b9f26cc3..ab7dda30f 100644
--- a/roundcubemail/program/lib/Mail/mimePart.php
+++ b/roundcubemail/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);