From 5381636fc45b59fde9877a41a79da092cdb48cd5 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 10 Apr 2014 02:42:57 -0400
Subject: [PATCH] Make sure preformance info logged in devel_mode uses locale-independent number format

---
 plugins/database_attachments/database_attachments.php |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/database_attachments/database_attachments.php b/plugins/database_attachments/database_attachments.php
index f908074..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
@@ -124,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