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

Fill in missing fields in getSiteInfo() and getSiteInfoByDomain()

Browse source
This commit is contained in:
Kijin Sung 2017-02-20 22:49:32 +09:00
parent bad9fe5d98
commit 254e6910d0
1 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,18 @@ class moduleModel extends module
$args = new stdClass();
$args->domain_srl = $site_srl;
$output = executeQuery('module.getDomainInfo', $args, $columnList);
return $output->data;
if ($output->data)
{
$domain_info = $output->data;
$domain_info->site_srl = 0;
$domain_info->settings = $domain_info->settings ? json_decode($domain_info->settings) : new stdClass;
$domain_info->default_language = $domain_info->settings->language ?: config('locale.default_lang');
return $domain_info;
}
else
{
return $output->data;
}
}
function getSiteInfoByDomain($domain, $columnList = array())
@ -70,7 +81,18 @@ class moduleModel extends module
$args = new stdClass();
$args->domain = $domain;
$output = executeQuery('module.getDomainInfo', $args, $columnList);
return $output->data;
if ($output->data)
{
$domain_info = $output->data;
$domain_info->site_srl = 0;
$domain_info->settings = $domain_info->settings ? json_decode($domain_info->settings) : new stdClass;
$domain_info->default_language = $domain_info->settings->language ?: config('locale.default_lang');
return $domain_info;
}
else
{
return $output->data;
}
}
/**