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

# Conflicts:
#	composer.lock
#	core/log.class.inc.php
#	datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
#	lib/composer/autoload_real.php
#	setup/licenses/community-licenses.xml
#	setup/setuputils.class.inc.php
This commit is contained in:
Eric Espie
2022-07-11 09:23:18 +02:00
33 changed files with 950 additions and 711 deletions

View File

@@ -684,6 +684,7 @@ class SetupUtils
* Emulates sys_get_temp_dir if needed (PHP < 5.2.1)
*
* @return string Path to the system's temp directory
* @uses \sys_get_temp_dir()
*/
public static function GetTmpDir() {
return realpath(sys_get_temp_dir());