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

Fix #2202 undefined properties if domain settings are not saved

Browse source
This commit is contained in:
Kijin Sung 2023-10-31 11:50:00 +09:00
parent a602779fc2
commit d79c2f5140
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
classes/context/Context.class.php
View file

@ -747,7 +747,7 @@ class Context
public static function getSiteTitle()
{
$domain_info = self::get('site_module_info');
if ($domain_info && $domain_info->settings && $domain_info->settings->title)
if ($domain_info && $domain_info->settings && !empty($domain_info->settings->title))
{
return escape(self::replaceUserLang($domain_info->settings->title, true), false);
}
@ -765,7 +765,7 @@ class Context
public static function getSiteSubtitle()
{
$domain_info = self::get('site_module_info');
if ($domain_info && $domain_info->settings && $domain_info->settings->subtitle)
if ($domain_info && $domain_info->settings && !empty($domain_info->settings->subtitle))
{
return escape(self::replaceUserLang($domain_info->settings->subtitle, true), false);
}

6
classes/module/ModuleHandler.class.php
View file

@ -666,15 +666,15 @@ class ModuleHandler extends Handler
if(($type === 'view' || $type === 'mobile') && $kind !== 'admin')
{
$domain_info = Context::get('site_module_info');
if ($domain_info && $domain_info->settings && $domain_info->settings->html_header)
if ($domain_info && $domain_info->settings && !empty($domain_info->settings->html_header))
{
Context::addHtmlHeader($domain_info->settings->html_header);
}
if ($domain_info && $domain_info->settings && $domain_info->settings->html_footer)
if ($domain_info && $domain_info->settings && !empty($domain_info->settings->html_footer))
{
Context::addHtmlFooter($domain_info->settings->html_footer);
}
if ($domain_info && $domain_info->settings && $domain_info->settings->title)
if ($domain_info && $domain_info->settings && !empty($domain_info->settings->title))
{
if(!Context::getBrowserTitle())
{