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

Conflicts:

	CHANGELOG

CHANGELOG

@@ -11,6 +11,7 @@ CHANGELOG Roundcube Webmail
 - Fix bug where messages count was not updated after message move/delete with skip_deleted=false (#1490372)
 - Fix security issue in contact photo handling (#1490379)
 - Fix bug where database_attachments_cache setting was not working
+- Fix attached file path unsetting in database_attachments plugin (#1490393)
 
 RELEASE 1.0.5
 -------------

plugins/database_attachments/database_attachments.php

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

plugins/redundant_attachments/redundant_attachments.php

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