X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Finst_upgrade.php;h=4e7e05b43309b0f6fb1c5ebd69d641712e843646;hb=a4b28f3fedae28ea92f597e345f75911c8118639;hp=9691b22e0eedeb4aa15bf0f1bf2958d09031b11f;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php
index 9691b22e..4e7e05b4 100644
--- a/admin/inst_upgrade.php
+++ b/admin/inst_upgrade.php
@@ -52,7 +52,7 @@ function get_installers()
 //
 //	Apply one differential data set.
 //
-function upgrade_step($index, $conn) 
+function upgrade_step($index, $company, $conn) 
 {
 	global $path_to_root, $installers;
 
@@ -75,7 +75,7 @@ function upgrade_step($index, $conn)
 			if ($sql != '')
 				$ret &= db_import($path_to_root.'/sql/'.$sql, $conn, $force);
 
-			$ret &= $inst->install($pref, $force);
+ 			$ret &= $inst->install($company, $force);
 
 			error_log(_("Database upgrade finished."));
 
@@ -104,11 +104,11 @@ if (get_post('Upgrade'))
 			continue;
 		}
 	// create security backup	
-		db_backup($conn, 'no', 'Security backup before upgrade', $conn['tbpref']);
+		db_backup($conn, 'no', 'Security backup before upgrade');
 	// apply all upgrade data
 		foreach ($installers as $i => $inst) 
 		{
-			$ret = upgrade_step($i, $conn);
+			$ret = upgrade_step($i, $comp, $conn);
 			if (!$ret)
 				display_error(
 				sprintf(_("Database upgrade to version %s failed for company '%s'."),