System Upgrade: fixed upgrade helpers to preserve sql script queries order, upgrade...

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

diff --git a/admin/inst_upgrade.php b/admin/inst_upgrade.php
index 5e5e1a9809ff1a514011a2fe8d659fb659597234..183221e1ada5c451ee715e3af6ad346261432296 100644 (file)
--- a/admin/inst_upgrade.php
+++ b/admin/inst_upgrade.php
@@ -86,7 +86,6 @@ foreach($site_status as $i => $comp)
        } else
                label_cell('-', 'align=center');
 
-
        if (!$status)
        {
                label_cell(radio(null, 'select_comp', $i, null, true), 'align=center');
@@ -103,8 +102,14 @@ div_start('upgrade_args');
 if (get_post('select_comp') !== '')
 {
        $patch = @$installers[$site_status[get_post('select_comp')]['version']];
-       if ($patch)
-               $patch->show_params(get_post('select_comp'));
+       if ($patch) {
+               if (!set_global_connection(get_post('select_comp'))) // create page in target database context
+                       display_error(_("Cannot connect to company database for database restore."));
+               else {
+                       $patch->show_params(get_post('select_comp'));
+                       set_global_connection(); // switch back
+               }
+       }
 }
 div_end();