- Simplified compose session data handling, no need for session->cleanup()

2 files changed, 0 insertions, 14 deletions

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index e06594fcd..6e07c9a4a 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -1228,7 +1228,6 @@ class rcmail
 
     // before closing the database connection, write session data
     if ($_SERVER['REMOTE_ADDR'] && is_object($this->session)) {
-      $this->session->cleanup();
       session_write_close();
     }
 
diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index 7c6097392..7b2b2dce0 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -325,19 +325,6 @@ class rcube_session
 
 
   /**
-   * 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');
-    }
-  }
-
-
-  /**
    * Register additional garbage collector functions
    *
    * @param mixed Callback function