- Applied fixes from trunk up to r5526

alecpl

2011-12-02 e237eec8468e99b65a9160a0a3f07529b92725e3

 program/include/rcube_session.php

@@ -336,19 +336,6 @@


  /**
   * 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
@@ -410,9 +397,12 @@
  public function reload()
  {
    if ($this->key && $this->memcache)
      $this->mc_read($this->key);
      $data = $this->mc_read($this->key);
    else if ($this->key)
      $this->db_read($this->key);
      $data = $this->db_read($this->key);

    if ($data)
     session_decode($data);
  }