From 8affba5be0de8ec5b7bf71e12171ccb53ead497b Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 14 Mar 2006 21:13:07 +0000
Subject: Improved error handling in DB connection failure

---
 program/include/main.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'program/include/main.inc')

diff --git a/program/include/main.inc b/program/include/main.inc
index 515de03b9..e6a26b773 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -74,10 +74,12 @@ function rcmail_startup($task='mail')
   
   $DB = new rcube_db($CONFIG['db_dsnw'], $CONFIG['db_dsnr']);
   $DB->sqlite_initials = $INSTALL_PATH.'SQL/sqlite.initial.sql';
+  $DB->db_connect('w');
+    
 
   // we can use the database for storing session data
   // session queries do not work with MDB2
-  if ($CONFIG['db_backend']!='mdb2' && is_object($DB))
+  if ($CONFIG['db_backend']!='mdb2' && !$DB->is_error())
     include_once('include/session.inc');
 
 
-- 
cgit v1.2.3