From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Fri, 5 Nov 2010 14:55:49 +0000 (+0000)
Subject: Two bugs in installer wizd fixed.
X-Git-Tag: v2.4.2~19^2~517
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=ab7a23a7b1c8ebc19b8301391ede254cd461327a;p=fa-stable.git

Two bugs in installer wizd fixed.
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b2a05d80..f6926b10 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+05-Nov-2010 Janusz Dobrowolski
+# Fixed admin username update and error when no prefix is selected in installer.
+$ /install/index.php
+
 04-Nov-2010 Janusz Dobrowolski
 # Fixed broken excel reprots for non-latin encodings.
 $ /reporting/includes/Workbook.php
diff --git a/install/index.php b/install/index.php
index 590b5b4d..ec6146e4 100644
--- a/install/index.php
+++ b/install/index.php
@@ -127,7 +127,7 @@ function install_connect_db() {
 
 function do_install() {
 
-	global $path_to_root, $db_connections, $def_coy, $installed_extensions, 
+	global $path_to_root, $db_connections, $def_coy, $installed_extensions, $tb_pref_counter,
 		$dflt_lang, $installed_languages;
 
 	$coa = $_SESSION['inst_set']['coa'];
@@ -150,9 +150,9 @@ function do_install() {
 		
 		update_company_prefs(array('coy_name'=>$con['name']));
 		$admin = get_user_by_login('admin');
-//		update_admin_password($con, md5($con['pass']));
-		update_user_prefs($admin['id'], array('language' => $_POST['lang'], 
-			'password' => md5($con['pass'])));
+		update_user_prefs($admin['id'], array(
+			'language' => $_POST['lang'], 
+			'user_id' => $con['admin'], 
 
 		if (!copy($path_to_root. "/config.default.php", $path_to_root. "/config.php")) {
 			display_error(_("Cannot save system configuration file 'config.php'."));