composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-01 14:38:47 +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/cmdbsource.class.inc.php
#	core/log.class.inc.php
#	test/setup/iTopDesignFormat/iTopDesignFormatTest.php
This commit is contained in:
Pierre Goiffon
2022-01-12 09:56:16 +01:00
parent c87de1024d 693a861e7d
commit b55ba2ac7f
6 changed files with 87 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
setup/backup.class.inc.php
View File

@@ -254,7 +254,7 @@ class DBBackup
return $aRet;
}
protected static function EscapeShellArg($sValue)
public static function EscapeShellArg($sValue)
{
// Note: See comment from the 23-Apr-2004 03:30 in the PHP documentation
// It suggests to rely on pctnl_* function instead of using escapeshellargs
@@ -461,13 +461,15 @@ EOF;
/**
* @see https://dev.mysql.com/doc/refman/5.6/en/encrypted-connection-options.html
*
* @param Config $oConfig
*
* @return string TLS arguments for CLI programs such as mysqldump. Empty string if the config does not use TLS.
*
* @since 2.5.0
* @uses \CMDBSource::GetDBVendor() so needs a connection opened !
* @uses \CMDBSource::GetDBVersion() so needs a connection opened !
*
* @since 2.5.0 N°1260
* @link https://dev.mysql.com/doc/refman/5.6/en/connection-options.html#encrypted-connection-options "Command Options for Encrypted Connections"
*/
public static function GetMysqlCliTlsOptions($oConfig)
{