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

N°1260 MySQL TLS connection : add options in setup

Browse Source 
SVN:trunk[5311]
This commit is contained in:
Pierre Goiffon
2018-02-08 14:21:51 +00:00
parent 3375629d06
commit 5a2576bc29
8 changed files with 608 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
setup/extensionsmap.class.inc.php
View File

@@ -542,9 +542,9 @@ class iTopExtensionsMap
*/
public function LoadChoicesFromDatabase(Config $oConfig)
{
$aInstalledExtensions = array();
try
{
$aInstalledExtensions = array();
if (CMDBSource::DBName() === null)
{
CMDBSource::InitFromConfig($oConfig);
@@ -555,7 +555,6 @@ class iTopExtensionsMap
catch (MySQLException $e)
{
// No database or erroneous information
$aInstalledExtensions = array();
return false;
}