Fix attached file path unsetting in database_attachments plugin (#1490393)

pull/277/head
Aleksander Machniak 9 years ago
parent 03aa84f784
commit b3bf9c88dc

@ -29,6 +29,7 @@ CHANGELOG Roundcube Webmail
- Fix possible memcache/apc cache data consistency issues (#1490390) - Fix possible memcache/apc cache data consistency issues (#1490390)
- Fix bug where imap_conn_options were ignored in IMAP connection test (#1490392) - Fix bug where imap_conn_options were ignored in IMAP connection test (#1490392)
- Fix bug where some files could have "executable" extension when stored in temp folder (#1490377) - Fix bug where some files could have "executable" extension when stored in temp folder (#1490377)
- Fix attached file path unsetting in database_attachments plugin (#1490393)
RELEASE 1.1.1 RELEASE 1.1.1
------------- -------------

@ -43,9 +43,9 @@ class database_attachments extends filesystem_attachments
$status = $cache->write($key, $data); $status = $cache->write($key, $data);
if ($status) { if ($status) {
$args['id'] = $key; $args['id'] = $key;
$args['status'] = true; $args['status'] = true;
unset($args['path']); $args['path'] = null;
} }
return $args; return $args;

@ -128,7 +128,7 @@ class redundant_attachments extends filesystem_attachments
$data = $args['path'] ? file_get_contents($args['path']) : $args['data']; $data = $args['path'] ? file_get_contents($args['path']) : $args['data'];
unset($args['data']); $args['data'] = null;
$key = $this->_key($args); $key = $this->_key($args);
$data = base64_encode($data); $data = base64_encode($data);

Loading…
Cancel
Save