From 677fb747c122d84a35654873b00b4a87670dcd33 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 25 Mar 2014 15:40:53 +0100
Subject: Fix fatal error in database_attachments plugin under some conditions
 (#1489726)

Conflicts:

	CHANGELOG
---
 plugins/database_attachments/database_attachments.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'plugins/database_attachments')

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