From fb71e73933c36cfffc20a7b22b9db9accb634ec0 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Fri, 05 Jun 2015 13:37:59 -0400 Subject: [PATCH] Fix SQL error on logout when using session_storage=php (#1490421) --- CHANGELOG | 2 ++ program/lib/Roundcube/rcube_session.php | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 41adb16..8521c3f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ CHANGELOG Roundcube Webmail =========================== +- Fix SQL error on logout when using session_storage=php (#1490421) + RELEASE 1.0.6 ------------- - Make SMTP error log more verbose - include server response and error code diff --git a/program/lib/Roundcube/rcube_session.php b/program/lib/Roundcube/rcube_session.php index caca262..4becdbe 100644 --- a/program/lib/Roundcube/rcube_session.php +++ b/program/lib/Roundcube/rcube_session.php @@ -135,7 +135,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