Fix fatal error in database_attachments plugin under some conditions …

…(#1489726)
roundcube · Mar 25, 2014 · e435d3b · e435d3b
1 parent bee1e18
commit e435d3b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -126,8 +126,10 @@ function get($args)
      */
     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);
+        }
     }
 
     /**