summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include/main.inc
diff options
context:
space:
mode:
authorroundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c>2006-03-14 21:13:07 +0000
committerroundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c>2006-03-14 21:13:07 +0000
commite322cd85ca85586327d047bc73c30c366a7bb0c6 (patch)
treee9a03ef9d90e4ef1b3301d0cc4b413ffbc82468d /roundcubemail/program/include/main.inc
parent6eac53131558fbd939eb4ff1bdc0d09246ceb116 (diff)
Improved error handling in DB connection failure
git-svn-id: https://svn.roundcube.net/trunk@164 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/main.inc')
-rw-r--r--roundcubemail/program/include/main.inc4
1 files changed, 3 insertions, 1 deletions
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');