Changeset ef5f7fb in github

Timestamp:

Jul 6, 2012 4:10:30 AM (11 months ago)

Author:

Aleksander Machniak <alec@…>

Children:

7794ae1

Parents:

5a927c7

Message:

There's a case (reason unknown) when destroy() is called with empty session key.
Handle this case properly to prevent from PHP error: Memcache::delete(): Key cannot be empty.

File:

• program/include/rcube_session.php (modified) (2 diffs)

program/include/rcube_session.php

@@ -219 +219 @@
    *
    * @param string Session ID
+   *
    * @return boolean True on success
    */
   public function db_destroy($key)
   {
-    $this->db->query(
-      sprintf("DELETE FROM %s WHERE sess_id = ?", $this->db->table_name('session')),
-      $key);
+    if ($key) {
+      $this->db->query(sprintf("DELETE FROM %s WHERE sess_id = ?", $this->db->table_name('session')), $key);
+    }
 
     return true;
@@ -306 +307 @@
    *
    * @param string Session ID
+   *
    * @return boolean True on success
    */
   public function mc_destroy($key)
   {
-    return $this->memcache->delete($key);
+    if ($key) {
+      $this->memcache->delete($key);
+    }
+
+    return true;
   }