summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-07-08 08:47:13 +0200
committerAleksander Machniak <alec@alec.pl>2013-07-08 08:48:16 +0200
commit00c2a90f69b0e997de5da20b84e2c535c90d3f38 (patch)
tree155b7df5a8df0e8527616211f108ee843427f9b7 /program
parente6a7be8b1f9531e35ecf3ed79553072bb2585418 (diff)
Fix "could not load message" error on valid empty message body (#1489228)
Conflicts: CHANGELOG
Diffstat (limited to 'program')
-rw-r--r--program/lib/Roundcube/rcube_imap_generic.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
index ab2e63d32..365525b5f 100644
--- a/program/lib/Roundcube/rcube_imap_generic.php
+++ b/program/lib/Roundcube/rcube_imap_generic.php
@@ -2509,7 +2509,11 @@ class rcube_imap_generic
$prev = '';
$found = true;
- while ($bytes > 0) {
+ // empty body
+ if (!$bytes) {
+ $result = '';
+ }
+ else while ($bytes > 0) {
$line = $this->readLine(8192);
if ($line === NULL) {