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-05 19:09:08 +00:00
parent b1ccb47200
commit 6935beece2

View File

@ -34,15 +34,6 @@ sub script_dolibarr_versions
return ( "2.8.0", "2.7.1" ); return ( "2.8.0", "2.7.1" );
} }
sub script_dolibarr_can_upgrade
{
local ($sinfo, $newver) = @_;
if ($newver >= 2.8 && $sinfo->{'version'} < 2.8) {
return 0;
}
return 1;
}
sub script_dolibarr_category sub script_dolibarr_category
{ {
return "Commerce"; return "Commerce";
@ -193,10 +184,10 @@ local $olddocdir = &transname();
local $url; local $url;
$path = &script_path_url($d, $opts); $path = &script_path_url($d, $opts);
if ($path =~ /^https:/) { if ($path =~ /^https:/) {
$url = "https://www.$d->{'dom'}"; $url = "https://$d->{'dom'}";
} }
else { else {
$url = "http://www.$d->{'dom'}"; $url = "http://$d->{'dom'}";
} }
if ($opts->{'path'} =~ /\w/) { if ($opts->{'path'} =~ /\w/) {
$url .= $opts->{'path'}; $url .= $opts->{'path'};