Index: trunk/core/kernel/db/db_connection.php
===================================================================
diff -u -N -r5096 -r6093
--- trunk/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 5096)
+++ trunk/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 6093)
@@ -176,18 +176,18 @@
 		function Connect($host, $user, $pass, $db, $force_new = false)
 		{
 			$func = $this->getMetaFunction('connect');
-			$this->connectionID = $func($host, $user, $pass, $force_new) or die('Can\'t connect to db');
+			$this->connectionID = $func($host, $user, $pass, $force_new) or trigger_error("Database connection failed, please check your connection settings", E_USER_ERROR);
 			if ($this->connectionID) {
 				$this->setDB($db);
 				$this->showError();
 			}
 		}
 
-		function ReConnect($host, $user, $pass, $db)
+		function ReConnect($host, $user, $pass, $db, $force_new = false)
 		{
 			$func = $this->getMetaFunction('close');
 			$func($this->connectionID);
-			$this->Connect($host, $user, $pass, $db);
+			$this->Connect($host, $user, $pass, $db, $force_new);
 		}
 
 		/**