X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Finst_upgrade.php;h=1d646af2ed571835653f693a1418ce48597066ea;hb=0bf933423b9645bcb57390c478d4fdaf0c895049;hp=20a056557e80d07fc16c263376f77b612ca7898a;hpb=5a592d93351bed4c7354d197905b5a832d25ea8c;p=fa-stable.git

diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php
index 20a05655..1d646af2 100644
--- a/admin/inst_upgrade.php
+++ b/admin/inst_upgrade.php
@@ -13,7 +13,7 @@ $page_security = 'SA_SOFTWAREUPGRADE';
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
 
-page(_("Software Upgrade"));
+page(_($help_context = "Software Upgrade"));
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/admin/db/company_db.inc");
@@ -29,10 +29,11 @@ include_once($path_to_root . "/includes/ui.inc");
 //
 function check_table($pref, $table, $field=null, $properties=null)
 {
-	$fields = @db_query("SHOW COLUMNS FROM ".$pref.$table);
-	if (!$fields)
+	$tables = @db_query("SHOW TABLES LIKE '".$pref.$table."'");
+	if (!db_num_rows($tables))
 		return 1;		// no such table or error
 
+	$fields = @db_query("SHOW COLUMNS FROM ".$pref.$table);
 	if (!isset($field)) 
 		return 0;		// table exists
 
@@ -89,7 +90,6 @@ function upgrade_step($index, $conn)
 	global $path_to_root, $installers;
 
 	$inst = $installers[$index];
-	$sql = $inst->sql;
 	$pref = $conn['tbpref'];
 	$ret = true;
 
@@ -99,7 +99,8 @@ function upgrade_step($index, $conn)
 		$state = $inst->installed($pref);
 		if (!$state || $force) 
 		{
-			if (!$inst->pre_check($pref)) return false;
+			if (!$inst->pre_check($pref, $force)) return false;
+			$sql = $inst->sql;
 
 			if ($sql != '')
 				$ret &= db_import($path_to_root.'/sql/'.$sql, $conn, $force);