fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 03:01:43 +09:00
Code Issues Projects Releases Packages Wiki Activity

Implement more accurate management of the current charset

Browse source
This commit is contained in:
Kijin Sung 2016-01-11 11:12:02 +09:00
parent ecac6d1490
commit d9a9cfe21b
4 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/install/install.controller.php
View file

@ -133,7 +133,7 @@ class installController extends install
if(!$oDB->isConnected()) return $oDB->getError();
// Check DB charset if using MySQL
if(stripos($db_info->master_db['db_type'], 'mysql') !== false)
if(stripos($db_info->master_db['db_type'], 'mysql') !== false && !isset($db_info->master_db['db_charset']))
{
$db_charset = $oDB->getBestSupportedCharset();
$db_info->master_db['db_charset'] = $db_charset;
@ -197,6 +197,7 @@ class installController extends install
'db_password' => Context::get('db_password'),
'db_database' => Context::get('db_database'),
'db_table_prefix' => Context::get('db_table_prefix'),
'db_charset' => Context::get('db_charset'),
);
$db_info->slave_db = array($db_info->master_db);
$db_info->default_url = Context::getRequestUri();