From 254e6910d03a1850e638b60d5477222462c6911b Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Mon, 20 Feb 2017 22:49:32 +0900 Subject: [PATCH] Fill in missing fields in getSiteInfo() and getSiteInfoByDomain() --- modules/module/module.model.php | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/modules/module/module.model.php b/modules/module/module.model.php index b58817b6c..e6de9a1fa 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -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; + } } /**