diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 4e3b43e4e..b78fa653c 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -435,13 +435,13 @@ class adminAdminView extends admin // Load member config. $member_config = getModel('module')->getModuleConfig('member'); Context::set('member_config', $member_config); - Context::set('webmaster_name', $member_config->webmaster_name ? $member_config->webmaster_name : 'webmaster'); - Context::set('webmaster_email', $member_config->webmaster_email); + Context::set('webmaster_name', !empty($member_config->webmaster_name) ? $member_config->webmaster_name : 'webmaster'); + Context::set('webmaster_email', $member_config->webmaster_email ?? ''); // Load module config. $module_config = getModel('module')->getModuleConfig('module'); Context::set('module_config', $module_config); - + // Load mail drivers. $mail_drivers = Rhymix\Framework\Mail::getSupportedDrivers(); uasort($mail_drivers, function($a, $b) { @@ -647,8 +647,8 @@ class adminAdminView extends admin // Meta keywords and description $oModuleModel = getModel('module'); $config = $oModuleModel->getModuleConfig('module'); - Context::set('site_meta_keywords', escape($config->meta_keywords)); - Context::set('site_meta_description', escape($config->meta_description)); + Context::set('site_meta_keywords', escape($config->meta_keywords ?? '')); + Context::set('site_meta_description', escape($config->meta_description ?? '')); // Titles Context::set('seo_main_title', escape(Rhymix\Framework\Config::get('seo.main_title') ?: '$SITE_TITLE - $SITE_SUBTITLE')); diff --git a/modules/admin/tpl/config_advanced.html b/modules/admin/tpl/config_advanced.html index 0ac9a11e3..f08ad0170 100644 --- a/modules/admin/tpl/config_advanced.html +++ b/modules/admin/tpl/config_advanced.html @@ -2,7 +2,7 @@ -
+

{$XE_VALIDATOR_MESSAGE}

@@ -157,8 +157,8 @@
diff --git a/modules/admin/tpl/config_debug.html b/modules/admin/tpl/config_debug.html index b635a4f56..8e6c6cb9a 100644 --- a/modules/admin/tpl/config_debug.html +++ b/modules/admin/tpl/config_debug.html @@ -2,7 +2,7 @@ -
+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/admin/tpl/config_domains.html b/modules/admin/tpl/config_domains.html index ecbc00cc4..fb99c2335 100644 --- a/modules/admin/tpl/config_domains.html +++ b/modules/admin/tpl/config_domains.html @@ -2,7 +2,7 @@ -
+

{$XE_VALIDATOR_MESSAGE}

diff --git a/modules/admin/tpl/config_notification.html b/modules/admin/tpl/config_notification.html index 3aef94036..c9f854615 100644 --- a/modules/admin/tpl/config_notification.html +++ b/modules/admin/tpl/config_notification.html @@ -3,7 +3,7 @@ -
+

{$XE_VALIDATOR_MESSAGE}

@@ -24,7 +24,7 @@
- +

{$lang->cmd_admin_default_from_name_help}

@@ -33,7 +33,7 @@
- +