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

Aleksander Machniak

2015-05-19 7fdc341a228abbbbf5139d8bf0386bd3462f053a

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

Conflicts:

	CHANGELOG

 CHANGELOG

@@ -11,6 +11,7 @@
- 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 @@
        $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 @@

        $data = $args['path'] ? file_get_contents($args['path']) : $args['data'];

        unset($args['data']);
        $args['data'] = null;

        $key  = $this->_key($args);
        $data = base64_encode($data);