-
-
Notifications
You must be signed in to change notification settings - Fork 7.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tpl/tplimpl: Deprecate .Site.Author usage in RSS template
- Loading branch information
Showing
1 changed file
with
45 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,61 @@ | ||
| {{- $pctx := . -}} | ||
| {{- if .IsHome -}}{{ $pctx = .Site }}{{- end -}} | ||
| {{- $pages := slice -}} | ||
| {{- if or $.IsHome $.IsSection -}} | ||
| {{- $pages = $pctx.RegularPages -}} | ||
| {{- else -}} | ||
| {{- $pages = $pctx.Pages -}} | ||
| {{- end -}} | ||
| {{- $limit := .Site.Config.Services.RSS.Limit -}} | ||
| {{- if ge $limit 1 -}} | ||
| {{- $pages = $pages | first $limit -}} | ||
| {{- end -}} | ||
| {{- /* Deprecate site.Author.email in favor of site.Params.author.email */}} | ||
| {{- $authorEmail := "" }} | ||
| {{- with site.Params.author.email }} | ||
| {{- $authorEmail = . }} | ||
| {{- else }} | ||
| {{- with site.Author.email }} | ||
| {{- $authorEmail = . }} | ||
| {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{- /* Deprecate site.Author.name in favor of site.Params.author.name */}} | ||
| {{- $authorName := "" }} | ||
| {{- with site.Params.author.name }} | ||
| {{- $authorName = . }} | ||
| {{- else }} | ||
| {{- with site.Author.name }} | ||
| {{- $authorName = . }} | ||
| {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{- $pctx := . }} | ||
| {{- if .IsHome }}{{ $pctx = .Site }}{{ end }} | ||
| {{- $pages := slice }} | ||
| {{- if or $.IsHome $.IsSection }} | ||
| {{- $pages = $pctx.RegularPages }} | ||
| {{- else }} | ||
| {{- $pages = $pctx.Pages }} | ||
| {{- end }} | ||
| {{- $limit := .Site.Config.Services.RSS.Limit }} | ||
| {{- if ge $limit 1 }} | ||
| {{- $pages = $pages | first $limit }} | ||
| {{- end }} | ||
| {{- printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }} | ||
| <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"> | ||
| <channel> | ||
| <title>{{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title> | ||
| <title>{{ if eq .Title .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} on {{ end }}{{ .Site.Title }}{{ end }}</title> | ||
| <link>{{ .Permalink }}</link> | ||
| <description>Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description> | ||
| <description>Recent content {{ if ne .Title .Site.Title }}{{ with .Title }}in {{ . }} {{ end }}{{ end }}on {{ .Site.Title }}</description> | ||
| <generator>Hugo -- gohugo.io</generator> | ||
| <language>{{ site.Language.LanguageCode }}</language>{{ with .Site.Author.email }} | ||
| <managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }} | ||
| <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }} | ||
| <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }} | ||
| <language>{{ site.Language.LanguageCode }}</language>{{ with $authorEmail }} | ||
| <managingEditor>{{.}}{{ with $authorName }} ({{ . }}){{ end }}</managingEditor>{{ end }}{{ with $authorEmail }} | ||
| <webMaster>{{ . }}{{ with $authorName }} ({{ . }}){{ end }}</webMaster>{{ end }}{{ with .Site.Copyright }} | ||
| <copyright>{{ . }}</copyright>{{ end }}{{ if not .Date.IsZero }} | ||
| <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }} | ||
| {{- with .OutputFormats.Get "RSS" -}} | ||
| {{- with .OutputFormats.Get "RSS" }} | ||
| {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }} | ||
| {{- end -}} | ||
| {{ range $pages }} | ||
| {{- end }} | ||
| {{- range $pages }} | ||
| <item> | ||
| <title>{{ .Title }}</title> | ||
| <link>{{ .Permalink }}</link> | ||
| <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate> | ||
| {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}} | ||
| {{- with $authorEmail }}<author>{{ . }}{{ with $authorName }} ({{ . }}){{ end }}</author>{{ end }} | ||
| <guid>{{ .Permalink }}</guid> | ||
| <description>{{ .Summary | html }}</description> | ||
| </item> | ||
| {{ end }} | ||
| {{- end }} | ||
| </channel> | ||
| </rss> |
d4016ddThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This commit seems to have introduced this error:
d4016ddThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed by changing
author = '...'in[params]to a separate[author]block.d4016ddThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We're aware of the problem and are working on a fix. Effects are theme/template dependent.