From 703a432f7b0078117cd5bdc132de147a3e5c20ad Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Wed, 16 May 2018 08:01:59 +0000
Subject: [PATCH] =?UTF-8?q?N=C2=B01173:=20code=20refactoring=20of=20the=20?=
 =?UTF-8?q?previously=20coded=20bugfix.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SVN:trunk[5792]
---
 core/config.class.inc.php      | 18 ++++--------------
 setup/setuputils.class.inc.php |  2 +-
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/core/config.class.inc.php b/core/config.class.inc.php
index 361af4960..0a324ac17 100644
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -1176,20 +1176,10 @@ class Config
 
 	}
 
-	public function Get($sPropCode, $sModule = null)
-	{
-		$sRetValue = '';
-		if(empty($sModule))
-		{
-			$sRetValue = $this->m_aSettings[$sPropCode]['value'];
-		}
-		else
-		{
-			$sRetValue = $this->m_aModuleSettings[$sModule][$sPropCode];
-
-		}
-		return $sRetValue;
-	}
+    public function Get($sPropCode)
+    {
+        return $this->m_aSettings[$sPropCode]['value'];
+    }
 
 	/**
 	 * Event log options (see LOG_... definition)
diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php
index 18986e3e1..58ab9457a 100644
--- a/setup/setuputils.class.inc.php
+++ b/setup/setuputils.class.inc.php
@@ -837,7 +837,7 @@ class SetupUtils
 				'db_tls_enabled' => $oPrevConf->Get('db_tls.enabled'),
 				'db_tls_ca' => $oPrevConf->Get('db_tls.ca'),
 				'graphviz_path' => $oPrevConf->Get('graphviz_path'),
-				'mysql_bindir' => $oPrevConf->Get('mysql_bindir', 'itop-backup'),
+				'mysql_bindir' => $oPrevConf->GetModuleSetting('itop-backup', 'mysql_bindir', ''),
 			);
 		}