From 6169b63edf0131149cd6c0b70a2eb8b5adddb008 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Sep 2008 18:08:30 +0000 Subject: [PATCH] For patch release --- build/makepack-dolibarr.pl | 2 +- htdocs/install/check.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 1cf3beb327e..90519eeb710 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -55,7 +55,7 @@ $VERSION="1.0 (build $REVISION)"; ($DIR=$0) =~ s/([^\/\\]+)$//; ($PROG=$1) =~ s/\.([^\.]*)$//; $Extension=$1; $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/; -$SOURCE="$DIR/../../dolibarr"; +$SOURCE="$DIR/.."; $DESTI="$SOURCE/build"; # Detect OS type diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 6b490acd6cd..ac715ff851a 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -273,7 +273,9 @@ else { $versionfrom=$migarray['from']; $versionto=$migarray['to']; - print ''.$langs->trans("Upgrade").' '.$versionfrom.' -> '.$versionto.''; + $newversionfrom=eregi_replace('\.[0-9]+$','.*',$versionfrom); + $newversionto=eregi_replace('\.[0-9]+$','.*',$versionto); + print ''.$langs->trans("Upgrade").' '.$newversionfrom.' -> '.$newversionto.''; print $langs->trans("UpgradeDesc").''; print ''; if ($allowupgrade)