Fix SQL error on logout when using session_storage=php (#1490421)

Conflicts:
	CHANGELOG

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

program/lib/Roundcube/rcube_session.php

@@ -135,7 +135,15 @@ class rcube_session
      */
     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;
+        }
     }