fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-25 21:32:51 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove remaining references to getDBInfo()

Browse source
This commit is contained in:
Kijin Sung 2016-02-05 15:18:31 +09:00
parent 9895699591
commit f7aad28d2c
12 changed files with 25 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/module/module.admin.controller.php
View file

@ -868,9 +868,8 @@ class moduleAdminController extends module
$langMap[$val->lang_code][$val->name] = $val->value;
}
$lang_supported = Context::get('lang_supported');
$dbInfo = Context::getDBInfo();
$defaultLang = $dbInfo->lang_type;
$lang_supported = Context::loadLangSelected();
$defaultLang = config('locale.default_lang');
if(!is_array($langMap[$defaultLang]))
{

6
modules/module/module.class.php
View file

@ -29,7 +29,6 @@ class module extends ModuleObject
$output = $oDB->executeQuery('module.getSite', $args);
if(!$output->data || !$output->data->index_module_srl)
{
$db_info = Context::getDBInfo();
$domain = Context::getDefaultUrl();
$url_info = parse_url($domain);
$domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
@ -38,7 +37,7 @@ class module extends ModuleObject
$site_args->site_srl = 0;
$site_args->index_module_srl = 0;
$site_args->domain = $domain;
$site_args->default_language = $db_info->lang_type;
$site_args->default_language = config('locale.default_lang');
$output = executeQuery('module.insertSite', $site_args);
if(!$output->toBool()) return $output;
@ -328,14 +327,13 @@ class module extends ModuleObject
{
// Basic mid, language Wanted
$mid_output = $oDB->executeQuery('module.getDefaultMidInfo', $args);
$db_info = Context::getDBInfo();
$domain = Context::getDefaultUrl();
$url_info = parse_url($domain);
$domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
$site_args->site_srl = 0;
$site_args->index_module_srl = $mid_output->data->module_srl;
$site_args->domain = $domain;
$site_args->default_language = $db_info->lang_type;
$site_args->default_language = config('locale.default_lang');
$output = executeQuery('module.insertSite', $site_args);
if(!$output->toBool()) return $output;

3
modules/module/module.model.php
View file

@ -171,7 +171,6 @@ class moduleModel extends module
// Get mid, language
$mid_output = $oDB->executeQuery('module.getDefaultMidInfo', $args);
$db_info = Context::getDBInfo();
$domain = Context::getDefaultUrl();
$url_info = parse_url($domain);
$domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
@ -180,7 +179,7 @@ class moduleModel extends module
$site_args->site_srl = 0;
$site_args->index_module_srl = $mid_output->data->module_srl;
$site_args->domain = $domain;
$site_args->default_language = $db_info->lang_type;
$site_args->default_language = config('locale.default_lang');
if($output->data && !$output->data->index_module_srl)
{