composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-22 10:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2249 - Supportability - Updater module (unified version name)

Browse Source
This commit is contained in:
Eric
2020-01-16 18:13:58 +01:00
parent 4552bc0778
commit 8a1a78444d
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
setup/wizardsteps.class.inc.php
View File

@@ -518,9 +518,9 @@ EOF
$sInstalledVersion = $aInstalledInfo['product_version'];
$sInstalledDataModelVersion = $aInstalledInfo['datamodel_version'];
$oPage->add("<h2>Information about the upgrade from version $sInstalledVersion to ".ITOP_VERSION.'.'.ITOP_REVISION."</h2>");
$oPage->add("<h2>Information about the upgrade from version $sInstalledVersion to ".ITOP_VERSION_FULL."</h2>");
if ($sInstalledVersion == (ITOP_VERSION.'.'.ITOP_REVISION))
if ($sInstalledVersion == ITOP_VERSION_FULL)
{
// Reinstalling the same version let's skip the license agreement...
$bDisplayLicense = false;
@@ -542,7 +542,7 @@ EOF
{
// No compatible version exists... cannot upgrade. Either it is too old, or too new (downgrade !)
$this->bCanMoveForward = false;
$oPage->p("The current version of ".ITOP_APPLICATION." (".ITOP_VERSION.'.'.ITOP_REVISION.") does not seem to be compatible with the installed version ($sInstalledVersion).");
$oPage->p("The current version of ".ITOP_APPLICATION." (".ITOP_VERSION_FULL.") does not seem to be compatible with the installed version ($sInstalledVersion).");
$oPage->p("The upgrade cannot continue, sorry.");
}
else