Fix: switch the variables "$ver" and $upgrade->{'version'}

Fix: call "etape5" page for fix the new version
This commit is contained in:
Regis Houssin 2010-04-04 08:15:20 +00:00
parent d883a88e2e
commit 311454d4c2

View File

@ -209,20 +209,28 @@ if ($upgrade) {
# First page (Update database schema)
local @params = ( [ "action", "upgrade" ],
[ "versionfrom", $ver ],
[ "versionto", $upgrade->{'version'} ],
[ "versionfrom", $upgrade->{'version'} ],
[ "versionto", $ver ],
);
local $err = &call_dolibarr_wizard_page(\@params, "upgrade", $d, $opts);
return (-1, "Dolibarr wizard failed : $err") if ($err);
# Second page (Migrate some data)
local @params = ( [ "action", "upgrade" ],
[ "versionfrom", $ver ],
[ "versionto", $upgrade->{'version'} ],
[ "versionfrom", $upgrade->{'version'} ],
[ "versionto", $ver ],
);
local $err = &call_dolibarr_wizard_page(\@params, "upgrade2", $d, $opts);
return (-1, "Dolibarr wizard failed : $err") if ($err);
# Third page (Update version number)
local @params = ( [ "action", "upgrade" ],
[ "versionfrom", $upgrade->{'version'} ],
[ "versionto", $ver ],
);
local $err = &call_dolibarr_wizard_page(\@params, "etape5", $d, $opts);
return (-1, "Dolibarr wizard failed : $err") if ($err);
# Remove the installation directory.
local $dinstall = "$opts->{'dir'}/install";
$dinstall =~ s/\/$//;