From cf383bcf6be21ef09499c551e89ba27d0807d046 Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Fri, 6 Sep 2013 15:18:41 +0000 Subject: [PATCH] Fixed bug (wrong DB charset after invoking AnalyzeInstallation!) SVN:trunk[2847] --- setup/runtimeenv.class.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup/runtimeenv.class.inc.php b/setup/runtimeenv.class.inc.php index d46718d81..6cb92b8fd 100644 --- a/setup/runtimeenv.class.inc.php +++ b/setup/runtimeenv.class.inc.php @@ -182,6 +182,7 @@ class RunTimeEnvironment { require_once(APPROOT.'/core/cmdbsource.class.inc.php'); CMDBSource::Init($oConfig->GetDBHost(), $oConfig->GetDBUser(), $oConfig->GetDBPwd(), $oConfig->GetDBName()); + CMDBSource::SetCharacterSet($oConfig->GetDBCharacterSet(), $oConfig->GetDBCollation()); $aSelectInstall = CMDBSource::QueryToArray("SELECT * FROM ".$oConfig->GetDBSubname()."priv_module_install"); } catch (MySQLException $e) @@ -512,6 +513,7 @@ class RunTimeEnvironment { require_once(APPROOT.'/core/cmdbsource.class.inc.php'); CMDBSource::Init($oConfig->GetDBHost(), $oConfig->GetDBUser(), $oConfig->GetDBPwd(), $oConfig->GetDBName()); + CMDBSource::SetCharacterSet($oConfig->GetDBCharacterSet(), $oConfig->GetDBCollation()); $sSQLQuery = "SELECT * FROM ".$oConfig->GetDBSubname()."priv_module_install"; $aSelectInstall = CMDBSource::QueryToArray($sSQLQuery); }