From 609c5e9da9bb52c317eea1abbd424cca181caad9 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 11 Jul 2011 10:51:42 +0000
Subject: Session object can be null if db/memcache is not available

---
 program/include/rcmail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'program/include/rcmail.php')

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index dba846dd2..72f0efa92 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -1165,7 +1165,7 @@ class rcmail
       $this->imap->close();
 
     // before closing the database connection, write session data
-    if ($_SERVER['REMOTE_ADDR']) {
+    if ($_SERVER['REMOTE_ADDR'] && is_object($this->session)) {
       $this->session->cleanup();
       session_write_close();
     }
-- 
cgit v1.2.3