X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Finst_upgrade.php;h=aa0d28388d35fad0459fb12a2277725ed2512c0d;hb=45a035785b9a820621da56dec93078b3ccd9832e;hp=9ef317ebebb0ae5a8b548a63a93c880c3174b2fd;hpb=36ec54507b7841b2352734b81e45b95e371ecdab;p=fa-stable.git

diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php
index 9ef317eb..aa0d2838 100644
--- a/admin/inst_upgrade.php
+++ b/admin/inst_upgrade.php
@@ -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
 
@@ -98,7 +99,7 @@ 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 != '')