Partial changes for new access control system.

[fa-stable.git] / admin / inst_upgrade.php

diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php
index 4a5106b96a2c59a6f439102eaf6b2032130ccc48..9166a59240c8f45fd1c71cb394abf204cd62eb77 100644 (file)
--- a/admin/inst_upgrade.php
+++ b/admin/inst_upgrade.php
@@ -29,7 +29,7 @@ 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);
+       $fields = @db_query("SHOW COLUMNS FROM ".$pref.$table);
        if (!$fields)
                return 1;               // no such table or error
 
@@ -134,13 +134,8 @@ if (get_post('Upgrade'))
                                ." '".$conn['name']."'");
                        continue;
                }
-       // create security backup               
-               if ($conn['tbpref'] != "")
-                       $filename = $conn['dbname'] . "_" . $conn['tbpref'] . date("Ymd_Hi") . ".sql";
-               else
-                       $filename = $conn['dbname'] . "_" . date("Ymd_Hi") . ".sql";
-
-               db_export($conn, $filename, 'no', 'Security backup before upgrade', $conn['tbpref']);
+       // create security backup       
+               db_backup($conn, 'no', 'Security backup before upgrade', $conn['tbpref']);
        // apply all upgrade data
                foreach ($installers as $i => $inst) 
                {
@@ -159,7 +154,7 @@ if (get_post('Upgrade'))
        {       // re-read the prefs
                global $path_to_root;
                include_once($path_to_root . "/admin/db/users_db.inc");
-               $user = get_user($_SESSION["wa_current_user"]->username);
+               $user = get_user_by_login($_SESSION["wa_current_user"]->username);
                $_SESSION["wa_current_user"]->prefs = new user_prefs($user);
                display_notification(_('All companies data has been successfully updated'));
        }