diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | SQL/sqlite.initial.sql | 2 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_imap_generic.php | 6 |
3 files changed, 7 insertions, 2 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix "could not load message" error on valid empty message body (#1489228) - Check filetype detection in installer and update script (#1489193) - Fix handling of message/rfc822 attachments on message forward and edit (#1489214) - Fix folder names truncation in Classic skin (#1489220) diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql index 28a43680d..e7f74ddfc 100644 --- a/SQL/sqlite.initial.sql +++ b/SQL/sqlite.initial.sql @@ -126,7 +126,7 @@ CREATE TABLE cache ( user_id integer NOT NULL default 0, cache_key varchar(128) NOT NULL default '', created datetime NOT NULL default '0000-00-00 00:00:00', - expires datetime DEFAULT NOT, + expires datetime DEFAULT NULL, data text NOT NULL ); diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php index 9b11624a7..70ffd0d10 100644 --- a/program/lib/Roundcube/rcube_imap_generic.php +++ b/program/lib/Roundcube/rcube_imap_generic.php @@ -2543,7 +2543,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) { |