From b4fc647845be8d426b79e7db9dec4819dac3e446 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Tue, 1 Feb 2022 15:40:43 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B04714=20Rename=20\utils::GetItopVersionWi?= =?UTF-8?q?kiSyntax=20to=20GetCoreVersionWikiSyntax=20Will=20avoid=20confu?= =?UTF-8?q?sion=20between=20core=20or=20product=20version=20!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/utils.inc.php | 4 ++-- approot.inc.php | 2 +- setup/setuputils.class.inc.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/utils.inc.php b/application/utils.inc.php index 273345039..c473bfd11 100644 --- a/application/utils.inc.php +++ b/application/utils.inc.php @@ -2246,11 +2246,11 @@ class utils } /** - * @return string eg : '2_7_0' iTop core version is '2.7.1-dev' + * @return string eg : '2_7_0' if iTop core version is '2.7.5-2' * @throws \ApplicationException if constant value is invalid * @uses ITOP_CORE_VERSION */ - public static function GetItopVersionWikiSyntax() + public static function GetCoreVersionWikiSyntax() { $aExplodedVersion = explode('.', ITOP_CORE_VERSION); diff --git a/approot.inc.php b/approot.inc.php index dae2341e2..e00277bc9 100644 --- a/approot.inc.php +++ b/approot.inc.php @@ -11,7 +11,7 @@ define('APPCONF', APPROOT.'conf/'); * When releasing, both constants should be updated : see `.make/release/update-versions.php` for that ! * * @since 2.7.7 3.0.1 3.1.0 N°4714 constant creation - * @used-by utils::GetItopVersionWikiSyntax() + * @used-by utils::GetCoreVersionWikiSyntax() * @used-by iTopModulesPhpVersionIntegrationTest */ define('ITOP_CORE_VERSION', '2.7.7'); diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php index 7d82ecb05..e8ccf497a 100644 --- a/setup/setuputils.class.inc.php +++ b/setup/setuputils.class.inc.php @@ -918,7 +918,7 @@ class SetupUtils $oPage, $bIsItopInstall, $sDBServer, $sDBUser, $sDBPwd, $sDBName, $sDBPrefix, $bTlsEnabled, $sTlsCA, $sNewDBName = '' ) { - $sWikiVersion = utils::GetItopVersionWikiSyntax(); //eg : '2_7_0'; + $sWikiVersion = utils::GetCoreVersionWikiSyntax(); //eg : '2_7_0'; $sMysqlTlsWikiPageUrl = 'https://www.itophub.io/wiki/page?id='.$sWikiVersion.':install:php_and_mysql_tls'; $oPage->add(''); @@ -1194,7 +1194,7 @@ EOF { $aResult['checks'][] = new CheckResult(CheckResult::INFO, "MySQL server's max_allowed_packet ($sMaxAllowedPacketFriendly) is big enough compared to upload_max_filesize ($sMaxUploadSizeFriendly)."); } else if ($iMaxAllowedPacket < $iMaxUploadSize) { - $sWikiVersion = utils::GetItopVersionWikiSyntax(); //eg : '2_7_0'; + $sWikiVersion = utils::GetCoreVersionWikiSyntax(); //eg : '2_7_0'; $sAttachmentsVarsWikiPageUrl = 'https://www.itophub.io/wiki/page?id='.$sWikiVersion .':install:php_and_mysql_configuration#attachments_upload';