From a873d934f56c3173fae671440094f71ee8eaf91d Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 27 Aug 2014 08:37:52 -0400
Subject: [PATCH] Give precedence to plugin.* actions over custom tasks registered by plugins
---
plugins/database_attachments/database_attachments.php | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/plugins/database_attachments/database_attachments.php b/plugins/database_attachments/database_attachments.php
index 47e2b52..e4abf93 100644
--- a/plugins/database_attachments/database_attachments.php
+++ b/plugins/database_attachments/database_attachments.php
@@ -13,7 +13,9 @@
* @author Aleksander Machniak <alec@alec.pl>
* @version @package_version@
*/
-require_once('plugins/filesystem_attachments/filesystem_attachments.php');
+
+require_once INSTALL_PATH . 'plugins/filesystem_attachments/filesystem_attachments.php';
+
class database_attachments extends filesystem_attachments
{
// Cache object
@@ -84,14 +86,10 @@
*/
function remove($args)
{
- $args['status'] = false;
-
$cache = $this->get_cache();
$status = $cache->remove($args['id']);
- if ($status) {
- $args['status'] = true;
- }
+ $args['status'] = true;
return $args;
}
@@ -128,8 +126,10 @@
*/
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);
+ }
}
/**
--
Gitblit v1.9.1