Apply site title, subtitle, and footer for each domain

This commit is contained in:
Kijin Sung 2017-03-12 23:33:35 +09:00
parent 03087aa7ba
commit fc6002f2cb
2 changed files with 11 additions and 11 deletions

View file

@ -774,10 +774,10 @@ class Context
*/ */
public static function getSiteTitle() public static function getSiteTitle()
{ {
$moduleConfig = getModel('module')->getModuleConfig('module'); $domain_info = self::get('site_module_info');
if (isset($moduleConfig->siteTitle)) if ($domain_info && $domain_info->settings && $domain_info->settings->title)
{ {
$title = trim($moduleConfig->siteTitle); $title = trim($domain_info->settings->title);
getController('module')->replaceDefinedLangCode($title); getController('module')->replaceDefinedLangCode($title);
return $title; return $title;
} }
@ -794,10 +794,10 @@ class Context
*/ */
public static function getSiteSubtitle() public static function getSiteSubtitle()
{ {
$moduleConfig = getModel('module')->getModuleConfig('module'); $domain_info = self::get('site_module_info');
if (isset($moduleConfig->siteSubtitle)) if ($domain_info && $domain_info->settings && $domain_info->settings->subtitle)
{ {
$subtitle = trim($moduleConfig->siteSubtitle); $subtitle = trim($domain_info->settings->subtitle);
getController('module')->replaceDefinedLangCode($subtitle); getController('module')->replaceDefinedLangCode($subtitle);
return $subtitle; return $subtitle;
} }

View file

@ -774,16 +774,16 @@ class ModuleHandler extends Handler
if($type == "view" && $kind != 'admin') if($type == "view" && $kind != 'admin')
{ {
$module_config = $oModuleModel->getModuleConfig('module'); $domain_info = Context::get('site_module_info');
if($module_config->htmlFooter) if ($domain_info && $domain_info->settings && $domain_info->settings->html_footer)
{ {
Context::addHtmlFooter($module_config->htmlFooter); Context::addHtmlFooter($domain_info->settings->html_footer);
} }
if($module_config->siteTitle) if ($domain_info && $domain_info->settings && $domain_info->settings->title)
{ {
if(!Context::getBrowserTitle()) if(!Context::getBrowserTitle())
{ {
Context::setBrowserTitle($module_config->siteTitle); Context::setBrowserTitle($domain_info->settings->title);
} }
} }
} }