From e435d3b1205c3e1a8f925fc131ed6d18820e2143 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 25 Mar 2014 15:40:53 +0100 Subject: Fix fatal error in database_attachments plugin under some conditions (#1489726) --- CHANGELOG | 1 + plugins/database_attachments/database_attachments.php | 6 ++++-- 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); + } } /** -- cgit v1.2.3