summaryrefslogtreecommitdiff
path: root/plugins
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:44:21 +0100
commit677fb747c122d84a35654873b00b4a87670dcd33 (patch)
tree891bc4bacff5cfbc6e5518e9aad04816a8b4aceb /plugins
parent5fefe78f750030f35d3c47cf9f379c431037a0e9 (diff)
Fix fatal error in database_attachments plugin under some conditions (#1489726)
Conflicts: CHANGELOG
Diffstat (limited to 'plugins')
-rw-r--r--plugins/database_attachments/database_attachments.php6
1 files changed, 4 insertions, 2 deletions
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);
+ }
}
/**