From d098e205a0d97c70c3c40e54d50895ee4fc2a213 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 09 Aug 2012 08:59:10 -0400
Subject: [PATCH] - Fix (workaround) delete operations with some versions of memcache (#1488592)

---
 program/include/rcube_session.php |   16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index 582b27e..3e3becb 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -319,7 +319,8 @@
    */
   public function mc_destroy($key)
   {
-    $ret = $this->memcache->delete($key);
+    // #1488592: use 2nd argument
+    $ret = $this->memcache->delete($key, 0);
     if ($this->mc_debug) write_log('memcache', "delete($key): " . ($ret ? 'OK' : 'ERR'));
     return $ret;
   }
@@ -332,19 +333,6 @@
   {
     foreach ($this->gc_handlers as $fct)
       call_user_func($fct);
-  }
-
-
-  /**
-   * Cleanup session data before saving
-   */
-  public function cleanup()
-  {
-    // current compose information is stored in $_SESSION['compose'], move it to $_SESSION['compose_data_<ID>']
-    if ($compose_id = $_SESSION['compose']['id']) {
-      $_SESSION['compose_data_'.$compose_id] = $_SESSION['compose'];
-      $this->remove('compose');
-    }
   }
 
 

--
Gitblit v1.9.1