Two bugs in installer wizd fixed.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b2a05d806f91892e6a54b8d07e427dbe26f24c33..f6926b1059e740ca26652f1bbc63d2ca6e4e2ade 100644 (file)
--- 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 590b5b4d0672d7a16d225f923bd8602ac6ad994f..ec6146e4d9d37aeede82474e0e3a9cbf1fd0381f 100644 (file)
--- 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'."));