diff options
| -rw-r--r-- | model/config.go | 2 | ||||
| -rw-r--r-- | webapp/components/header_footer_template.jsx | 26 |
2 files changed, 13 insertions, 15 deletions
diff --git a/model/config.go b/model/config.go index b233d8b55..aedba7013 100644 --- a/model/config.go +++ b/model/config.go @@ -714,7 +714,7 @@ func (o *Config) SetDefaults() { } if !IsSafeLink(o.SupportSettings.TermsOfServiceLink) { - *o.SupportSettings.TermsOfServiceLink = "" + *o.SupportSettings.TermsOfServiceLink = SUPPORT_SETTINGS_DEFAULT_TERMS_OF_SERVICE_LINK } if o.SupportSettings.TermsOfServiceLink == nil { diff --git a/webapp/components/header_footer_template.jsx b/webapp/components/header_footer_template.jsx index c41d7ee41..6fb9c9046 100644 --- a/webapp/components/header_footer_template.jsx +++ b/webapp/components/header_footer_template.jsx @@ -33,20 +33,18 @@ export default class NotLoggedIn extends React.Component { ); } - if (global.window.mm_config.TermsOfServiceLink) { - content.push( - <a - key='terms_link' - id='terms_link' - className='pull-right footer-link' - target='_blank' - rel='noopener noreferrer' - href={global.window.mm_config.TermsOfServiceLink} - > - <FormattedMessage id='web.footer.terms'/> - </a> - ); - } + content.push( + <a + key='terms_link' + id='terms_link' + className='pull-right footer-link' + target='_blank' + rel='noopener noreferrer' + href={global.window.mm_config.TermsOfServiceLink} + > + <FormattedMessage id='web.footer.terms'/> + </a> + ); if (global.window.mm_config.PrivacyPolicyLink) { content.push( |