diff --git a/apps/maarch_entreprise/Views/about-us.component.html b/apps/maarch_entreprise/Views/about-us.component.html index a86fc07485aa39f745e23e7fb5527115c9ff5b16..4cf0113a07f60a569e503b2bcb2b628913a05365 100755 --- a/apps/maarch_entreprise/Views/about-us.component.html +++ b/apps/maarch_entreprise/Views/about-us.component.html @@ -27,7 +27,7 @@ </div> <mat-card *ngIf="!loading" class="card-app-content"> <div class="col-sm-8"> - <h3>Maarch Courrier V{{applicationMinorVersion}} </h3> + <h3>Maarch Courrier {{applicationMinorVersion}} </h3> <hr/> <p><em>Copyright © 2008-2018 Maarch SAS {{lang.groupeCompany}}</em></p> <p>{{lang.maarchLicence}} diff --git a/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php b/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php index 1dd732f5f39618f75fdcb3cbfbc5500613f407cb..d54184596719fe7a8860f35862d50a09e7b2b083 100755 --- a/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php +++ b/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php @@ -620,7 +620,7 @@ abstract class business_app_tools_Abstract extends Database $_SESSION['maarch_entreprise']['database_version'] = "none"; } else { $vbg = $stmt->fetchObject(); - $_SESSION['maarch_entreprise']['database_version'] = (string) $xmlBase->databaseVersion; + $_SESSION['maarch_entreprise']['database_version'] = substr($vbg->param_value_string, 0, 5); $_SESSION['maarch_entreprise']['database_version_minor'] = (string) $xmlBase->databaseMinorVersion; } //If this two parameters is not find, this is the end of this function diff --git a/src/core/models/CoreConfigModel.php b/src/core/models/CoreConfigModel.php index 5a6ad9c26c45b43889339acaefab99db3ea9779c..b332e4ef05f92848af78dba3f12570655dff0eea 100644 --- a/src/core/models/CoreConfigModel.php +++ b/src/core/models/CoreConfigModel.php @@ -67,8 +67,8 @@ class CoreConfigModel if ($loadedXml) { return [ - 'applicationVersion' => (string) $loadedXml->databaseVersion, - 'applicationMinorVersion' => (string) $loadedXml->databaseMinorVersion, + 'applicationVersion' => (string) $loadedXml->majorVersion, + 'applicationMinorVersion' => (string) $loadedXml->minorVersion, ]; }