Added cancel edition hotkey

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

diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php
index 793e050b58acab89bcc624a596ab4345bb3cf369..4a5106b96a2c59a6f439102eaf6b2032130ccc48 100644 (file)
--- a/admin/inst_upgrade.php
+++ b/admin/inst_upgrade.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 20;
 $path_to_root="..";
 include_once($path_to_root . "/includes/session.inc");
@@ -89,7 +98,7 @@ function upgrade_step($index, $conn)
        {
                if (!$inst->installed($pref) || $force) 
                {
-       //              if(!$inst->pre_check($pref)) return false;
+                       if (!$inst->pre_check($pref)) return false;
 
                        if ($sql != '')
                                $ret &= db_import($path_to_root.'/sql/'.$sql, $conn, $force);
@@ -147,7 +156,13 @@ if (get_post('Upgrade'))
                if (!$ret) break;
        }
        if($ret)
+       {       // 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);
+               $_SESSION["wa_current_user"]->prefs = new user_prefs($user);
                display_notification(_('All companies data has been successfully updated'));
+       }       
        $Ajax->activate('_page_body');
 }