mirror of
				https://github.com/Wonderfall/hugo-WonderMod.git
				synced 2025-10-30 11:25:26 +01:00 
			
		
		
		
	[PATCH] tpl/tplimpl: Deprecate .Site.Author usage in RSS template
cherry-pick from d4016dd5cd
			
			
This commit is contained in:
		 Joe Mooring
					Joe Mooring
				
			
				
					committed by
					
						 Aditya Telange
						Aditya Telange
					
				
			
			
				
	
			
			
			 Aditya Telange
						Aditya Telange
					
				
			
						parent
						
							cf62fa3c40
						
					
				
				
					commit
					00488d0146
				
			| @@ -1,21 +1,43 @@ | |||||||
| {{- $pctx := . -}} | {{- /* Deprecate site.Author.email in favor of site.Params.author.email */}} | ||||||
| {{- if .IsHome -}}{{ $pctx = site }}{{- end -}} | {{- $authorEmail := "" }} | ||||||
| {{- $pages := slice -}} | {{- with site.Params.author.email }} | ||||||
| {{- if or $.IsHome $.IsSection -}} |   {{- $authorEmail = . }} | ||||||
| {{- $pages = $pctx.RegularPages -}} | {{- else }} | ||||||
| {{- else -}} |   {{- with site.Author.email }} | ||||||
| {{- $pages = $pctx.Pages -}} |     {{- $authorEmail = . }} | ||||||
| {{- end -}} |     {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }} | ||||||
| {{- $limit := site.Config.Services.RSS.Limit -}} |   {{- end }} | ||||||
| {{- if ge $limit 1 -}} | {{- end }} | ||||||
| {{- $pages = $pages | first $limit -}} |  | ||||||
| {{- 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 }} | {{- printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }} | ||||||
| <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:content="http://purl.org/rss/1.0/modules/content/"> | <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"> | ||||||
|   <channel> |   <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> |     <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> | ||||||
|     {{- with site.Params.images }} |     {{- with site.Params.images }} | ||||||
|     <image> |     <image> | ||||||
|       <title>{{ site.Title }}</title> |       <title>{{ site.Title }}</title> | ||||||
| @@ -24,21 +46,21 @@ | |||||||
|     </image> |     </image> | ||||||
|     {{- end }} |     {{- end }} | ||||||
|     <generator>Hugo -- gohugo.io</generator> |     <generator>Hugo -- gohugo.io</generator> | ||||||
|     <language>{{ site.Language.LanguageCode }}</language>{{ with site.Author.email }} |     <language>{{ site.Language.LanguageCode }}</language>{{ with $authorEmail }} | ||||||
|     <managingEditor>{{.}}{{ with site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with site.Author.email }} |     <managingEditor>{{.}}{{ with $authorName }} ({{ . }}){{ end }}</managingEditor>{{ end }}{{ with $authorEmail }} | ||||||
|     <webMaster>{{.}}{{ with site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with site.Copyright }} |     <webMaster>{{ . }}{{ with $authorName }} ({{ . }}){{ end }}</webMaster>{{ end }}{{ with .Site.Copyright }} | ||||||
|     <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }} |     <copyright>{{ . }}</copyright>{{ end }}{{ if not .Date.IsZero }} | ||||||
|     <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }} |     <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 }} |     {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }} | ||||||
|     {{- end -}} |     {{- end }} | ||||||
|     {{ range $pages }} |     {{- range $pages }} | ||||||
|     {{- if and (ne .Layout `search`) (ne .Layout `archives`) }} |     {{- if and (ne .Layout `search`) (ne .Layout `archives`) }} | ||||||
|     <item> |     <item> | ||||||
|       <title>{{ .Title }}</title> |       <title>{{ .Title }}</title> | ||||||
|       <link>{{ .Permalink }}</link> |       <link>{{ .Permalink }}</link> | ||||||
|       <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate> |       <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> |       <guid>{{ .Permalink }}</guid> | ||||||
|       <description>{{ with .Description | html }}{{ . }}{{ else }}{{ .Summary | html }}{{ end -}}</description> |       <description>{{ with .Description | html }}{{ . }}{{ else }}{{ .Summary | html }}{{ end -}}</description> | ||||||
|       {{- if site.Params.ShowFullTextinRSS }} |       {{- if site.Params.ShowFullTextinRSS }} | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user