summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-03-25 15:40:53 +0100
committerAleksander Machniak <alec@alec.pl>2014-03-25 15:40:53 +0100
commite435d3b1205c3e1a8f925fc131ed6d18820e2143 (patch)
treee19dacc68428ca0c4890fbce3710fb1e4c4c37da
parentbee1e18966c53f3a523f272ccd9e2cc9408534fd (diff)
Fix fatal error in database_attachments plugin under some conditions (#1489726)
-rw-r--r--CHANGELOG1
-rw-r--r--plugins/database_attachments/database_attachments.php6
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 503acd9bc..b78d4cdae 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ CHANGELOG Roundcube Webmail
- Fix opening compose screen in new window after saving as draft (#1489643)
- Fix message import dialog when no file is selected (#1489685)
- Fix opening compose screen in new window after saving as draft (#1489643)
+- Fix fatal error in database_attachments plugin under some conditions (#1489726)
RELEASE 1.0-rc
--------------
diff --git a/plugins/database_attachments/database_attachments.php b/plugins/database_attachments/database_attachments.php
index 5ec351404..e4abf937e 100644
--- a/plugins/database_attachments/database_attachments.php
+++ b/plugins/database_attachments/database_attachments.php
@@ -126,8 +126,10 @@ class database_attachments extends filesystem_attachments
*/
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);
+ }
}
/**