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

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

Browse Source 
# Conflicts:
#	test/phpunit.xml.dist
This commit is contained in:
Pierre Goiffon
2022-01-13 13:36:09 +01:00
parent ec0c98bb0f a43adcd202
commit 135ddbf37d
2 changed files with 52 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -469,6 +469,7 @@ EOF;
* @uses \CMDBSource::GetDBVersion() so needs a connection opened !
*
* @since 2.5.0 N°1260
* @since 2.6.2 2.7.0 N°2336 Call DB to get vendor and version (so CMDBSource must be init before calling this method)
* @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)