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

diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php
index 9ef317eb..670ecb15 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
 
@@ -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 != '')
@@ -163,6 +164,7 @@ if (get_post('Upgrade'))
 		$_SESSION["wa_current_user"]->prefs = new user_prefs($user);
 		display_notification(_('All companies data has been successfully updated'));
 	}	
+	unset($_SESSION['SysPrefs']); // re-read system setup
 	$Ajax->activate('_page_body');
 }