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

Aleksander Machniak

2015-05-19 b3bf9c88dcb3ccd56ceece8f1dc23312cdbd1861

 plugins/database_attachments/database_attachments.php

@@ -13,7 +13,9 @@
 * @author Aleksander Machniak <alec@alec.pl>
 * @version @package_version@
 */
require_once('plugins/filesystem_attachments/filesystem_attachments.php');

require_once INSTALL_PATH . 'plugins/filesystem_attachments/filesystem_attachments.php';

class database_attachments extends filesystem_attachments
{
    // Cache object
@@ -41,9 +43,9 @@
        $status = $cache->write($key, $data);

        if ($status) {
            $args['id'] = $key;
            $args['id']     = $key;
            $args['status'] = true;
            unset($args['path']);
            $args['path']   = null;
        }

        return $args;
@@ -124,8 +126,10 @@
     */
    function cleanup($args)
    {
        $cache = $this->get_cache();
        $cache->remove($args['group'], true);
        // check if cache object exist, it may be empty on session_destroy (#1489726)
        if ($cache = $this->get_cache()) {
            $cache->remove($args['group'], true);
        }
    }

    /**
@@ -151,7 +155,7 @@
            $type   = $rcmail->config->get('database_attachments_cache', 'db');

            // Init SQL cache (disable cache data serialization)
            $this->cache = $rcmail->get_cache($this->prefix, 'db', $ttl, false);
            $this->cache = $rcmail->get_cache($this->prefix, $type, $ttl, false);
        }

        return $this->cache;