X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Finst_upgrade.php;h=bd9e1b4ba4f6a610b639e52944ed548177a06e91;hb=7e994a8e658a7660dad5a4cd0c24fb8d174cc937;hp=eeee26a214b88152e2a01d84e9d607643f40eeb7;hpb=f760a3a7731827293078433106fc6f4054648721;p=fa-stable.git

diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php
index eeee26a2..bd9e1b4b 100644
--- a/admin/inst_upgrade.php
+++ b/admin/inst_upgrade.php
@@ -121,26 +121,16 @@ function upgrade_step($index, $conn)
 	return $ret;
 }
 
-function db_open($conn)
-{
-	$db = mysql_connect($conn["host"] ,$conn["dbuser"], $conn["dbpassword"]);
-	if (!$db)
-		return false;
-	if (!mysql_select_db($conn["dbname"], $db))
-		return false;
-	return $db;
-}
-
 $installers = get_installers();
 
 if (get_post('Upgrade')) 
 {
 
 	$ret = true;
-	foreach ($db_connections as $conn) 
+	foreach ($db_connections as $comp => $conn) 
 	{
 	// connect to database
-		if (!($db = db_open($conn))) 
+		if (!(set_global_connection($comp))) 
 		{
 			display_error(_("Cannot connect to database for company")
 				." '".$conn['name']."'");
@@ -162,6 +152,7 @@ if (get_post('Upgrade'))
 // 		db_close($conn); ?
 		if (!$ret) break;
 	}
+	set_global_connection();
 	if($ret)
 	{	// re-read the prefs
 		global $path_to_root;