浏览代码

Fixed bug (wrong DB charset after invoking AnalyzeInstallation!)

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@2847 a333f486-631f-4898-b8df-5754b55c2be0
romainq 12 年之前
父节点
当前提交
3deecd9aea
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. 2 0
      setup/runtimeenv.class.inc.php

+ 2 - 0
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);
 		}