From b3bf9c88dcb3ccd56ceece8f1dc23312cdbd1861 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 19 May 2015 03:26:55 -0400
Subject: [PATCH] Fix attached file path unsetting in database_attachments plugin (#1490393)
---
CHANGELOG | 1 +
plugins/database_attachments/database_attachments.php | 4 ++--
plugins/redundant_attachments/redundant_attachments.php | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 2c09bb3..3390758 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,7 @@
- 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 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
-------------
diff --git a/plugins/database_attachments/database_attachments.php b/plugins/database_attachments/database_attachments.php
index 76792fd..735915a 100644
--- a/plugins/database_attachments/database_attachments.php
+++ b/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;
diff --git a/plugins/redundant_attachments/redundant_attachments.php b/plugins/redundant_attachments/redundant_attachments.php
index 91a0275..24af7d9 100644
--- a/plugins/redundant_attachments/redundant_attachments.php
+++ b/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);
--
Gitblit v1.9.1