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

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source 
# Conflicts:
#	core/config.class.inc.php
#	setup/itopdesignformat.class.inc.php
This commit is contained in:
Pierre Goiffon
2022-01-26 16:07:34 +01:00
parent 3a56824cde 9b6f7d94f4
commit 627c0070c1
5 changed files with 62 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/config.class.inc.php
View File

@@ -27,13 +27,21 @@ define('ITOP_APPLICATION_SHORT', 'iTop');
* Constant containing the application version
* Warning: this might be different from iTop core version!
*
* @see ITOP_DESIGN_LATEST_VERSION for iTop core version
*
* @used-by utils::GetItopPatchVersion
* @see ITOP_CORE_VERSION to get iTop core version
*/
define('ITOP_VERSION', '3.0.1-dev');
define('ITOP_VERSION_NAME', 'Fullmoon');
/**
* Constant containing the iTop core version, whatever application was built
*
* Note that in iTop 3.0.0 we used {@see ITOP_DESIGN_LATEST_VERSION} to get core version.
* When releasing, both constants should be updated : see `.make/release/update-versions.php` for that !
*
* @since 2.7.7 3.0.1 3.1.1 N°4714 constant creation
* @used-by utils::GetItopPatchVersion
*/
define('ITOP_CORE_VERSION', '3.0.1');
define('ITOP_REVISION', 'svn');
define('ITOP_BUILD_DATE', '$WCNOW$');
define('ITOP_VERSION_FULL', ITOP_VERSION.'-'.ITOP_REVISION);
@@ -618,6 +626,13 @@ class Config
'source_of_value' => '',
'show_in_conf_sample' => false,
],
/**
* The timezone is automatically set using this parameter in \utils::InitTimeZone
* This method is called almost everywhere, cause it's called in \MetaModel::LoadConfig and exec.php... but you might
* need to get it yourself !
*
* @used-by utils::InitTimeZone()
*/
'timezone' => [
'type' => 'string',
'description' => 'Timezone (reference: http://php.net/manual/en/timezones.php). If empty, it will be left unchanged and MUST be explicitly configured in PHP',