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

Merge branch 'feature/install_config_file' into develop

Browse source
This commit is contained in:
akasima 2014-08-20 17:25:13 +09:00
commit 65e0449d7b
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -225,7 +225,8 @@ class installController extends install
); );
$db_info->slave_db = array($db_info->master_db); $db_info->slave_db = array($db_info->master_db);
$db_info->default_url = Context::getRequestUri(); $db_info->default_url = Context::getRequestUri();
$db_info->lang_type = Context::getLangType(); $db_info->lang_type = Context::get('lang_type') ? Context::get('lang_type') : Context::getLangType();
Context::setLangType($db_info->lang_type);
$db_info->use_rewrite = Context::get('use_rewrite'); $db_info->use_rewrite = Context::get('use_rewrite');
$db_info->time_zone = Context::get('time_zone'); $db_info->time_zone = Context::get('time_zone');

1
modules/install/install.view.php
View file

@ -53,6 +53,7 @@ class installView extends install
'password2' =>'pass', 'password2' =>'pass',
'nick_name' =>'admin', 'nick_name' =>'admin',
'user_id' =>'admin', 'user_id' =>'admin',
'lang_type' =>'ko', // en, jp, ...
); );
*/ */
include $install_config_file; include $install_config_file;