- Applied fixes from trunk up to r5526

alecpl

2011-12-02 e237eec8468e99b65a9160a0a3f07529b92725e3

 program/include/rcmail.php

@@ -453,8 +453,7 @@
    }

    // add to the 'books' array for shutdown function
    if (!isset($this->address_books[$id]))
      $this->address_books[$id] = $contacts;
    $this->address_books[$id] = $contacts;

    return $contacts;
  }
@@ -1228,7 +1227,6 @@

    // before closing the database connection, write session data
    if ($_SERVER['REMOTE_ADDR'] && is_object($this->session)) {
      $this->session->cleanup();
      session_write_close();
    }