From d438147ddc057e27e45954ca9f3ccb47d6292a34 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 05 Jun 2015 13:36:13 -0400
Subject: [PATCH] Fix SQL error on logout when using session_storage=php (#1490421)
---
CHANGELOG | 1 +
program/lib/Roundcube/rcube_session.php | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 7cb5840..408b166 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
===========================
- Fix "Importing..." message does not hide on error (#1490422)
+- Fix SQL error on logout when using session_storage=php (#1490421)
RELEASE 1.1.2
-------------
diff --git a/program/lib/Roundcube/rcube_session.php b/program/lib/Roundcube/rcube_session.php
index 8306a06..d15d146 100644
--- a/program/lib/Roundcube/rcube_session.php
+++ b/program/lib/Roundcube/rcube_session.php
@@ -144,7 +144,15 @@
*/
public function destroy($key)
{
- return $this->memcache ? $this->mc_destroy($key) : $this->db_destroy($key);
+ if ($this->storage == 'memcache' && $this->memcache) {
+ return $this->mc_destroy($key);
+ }
+ else if ($this->storage == 'db') {
+ return $this->db_destroy($key);
+ }
+ else {
+ return true;
+ }
}
--
Gitblit v1.9.1