tpl/tplimpl: Fix deprecation logic in embedded templates

Closes #11658
This commit is contained in:
Joe Mooring 2023-11-01 08:31:15 -07:00 committed by Bjørn Erik Pedersen
parent 5fa97ee964
commit cb98e9061b
2 changed files with 13 additions and 5 deletions

View file

@ -44,8 +44,10 @@
{{- /* Deprecate site.Social.facebook_admin in favor of site.Params.social.facebook_admin */}}
{{- $facebookAdmin := "" }}
{{- with site.Params.social.facebook_admin }}
{{- $facebookAdmin = . }}
{{- with site.Params.social }}
{{- if reflect.IsMap . }}
{{- $facebookAdmin = .facebook_admin }}
{{- end }}
{{- else }}
{{- with site.Social.facebook_admin }}
{{- $facebookAdmin = . }}

View file

@ -22,8 +22,10 @@
{{- /* Deprecate site.Social.twitter in favor of site.Params.social.twitter */}}
{{- $twitterSite := "" }}
{{- with site.Params.social.twitter }}
{{- $twitterSite = . }}
{{- with site.Params.social }}
{{- if reflect.IsMap . }}
{{- $twitterSite = .twitter }}
{{- end }}
{{- else }}
{{- with site.Social.twitter }}
{{- $twitterSite = . }}
@ -32,5 +34,9 @@
{{- end }}
{{- with $twitterSite }}
<meta name="twitter:site" content="@{{ . }}"/>
{{- $content := . }}
{{- if not (strings.HasPrefix . "@") }}
{{- $content = printf "@%v" $twitterSite }}
{{- end }}
<meta name="twitter:site" content="{{ $content }}"/>
{{- end }}