From e322cd85ca85586327d047bc73c30c366a7bb0c6 Mon Sep 17 00:00:00 2001
From: roundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Tue, 14 Mar 2006 21:13:07 +0000
Subject: Improved error handling in DB connection failure

git-svn-id: https://svn.roundcube.net/trunk@164 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/main.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index 515de03b9..e6a26b773 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/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