From 69944a5535b16007bd2cd8c546e8be6dfc35adf8 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 25 Aug 2009 10:26:56 -0400
Subject: [PATCH] Merged revisions 1281 - 1333

---
 server/lib/app.inc.php |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index e0ac82f..0fe0b8e 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -40,6 +40,11 @@
                 if($conf["start_db"] == true) {
                 	$this->load('db_'.$conf["db_type"]);
                 	$this->db = new db;
+					if($this->db->linkId) $this->db->closeConn();
+					$this->db->dbHost = $conf["db_host"];
+					$this->db->dbName = $conf["db_database"];
+					$this->db->dbUser = $conf["db_user"];
+					$this->db->dbPass = $conf["db_password"];
 					
 					/*
 					Initialize the connection to the master DB, 

--
Gitblit v1.9.1