1 files changed, 26 insertions, 20 deletions
diff --git a/themes/default/layouts/_default/rss.xml b/themes/default/layouts/_default/rss.xml
index 3eee035..d6a8f46 100644
--- a/themes/default/layouts/_default/rss.xml
+++ b/themes/default/layouts/_default/rss.xml
@@ -1,14 +1,7 @@
-{{- $pageContext := . -}}
-
-{{- if .IsHome -}}
-  {{- $pageContext = .Site -}}
-{{- end -}}
-
-{{- $pages := $pageContext.RegularPages -}}
 {{- $limit := .Site.Config.Services.RSS.Limit -}}
 
-{{- if ge $limit 1 -}}
-  {{- $pages = $pages | first $limit -}}
+{{- if lt $limit 1 -}}
+  {{- $limit = .Paginator.TotalNumberOfElements -}}
 {{- end -}}
 
 {{- $lastBuildDate := now.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML -}}
@@ -17,14 +10,7 @@
   {{- $lastBuildDate = .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML -}}
 {{- end -}}
 
-{{- $atomLink := "" -}}
-
-{{- with .OutputFormats.Get "RSS" -}}
-  {{- $atomLink = printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML -}}
-{{- end -}}
-
 {{- $author := partial "function-authors-data.html" . -}}
-
 {{- $title := partial "base-title.html" . -}}
 {{- $description := partial "base-title.html" . -}}
 
@@ -50,8 +36,24 @@
   )
 -}}
 
-{{- print "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
-{{ print "<?xml-stylesheet href=\"/rss.xsl\" type=\"text/xsl\"?>" | safeHTML }}
+{{- $atomSelf := "" -}}
+{{- $atomPrevious := "" -}}
+{{- $atomNext := "" -}}
+
+{{- with .OutputFormats.Get "RSS" -}}
+  {{- $atomSelf = printf `<atom:link rel="self" href=%q type=%q />` .Permalink .MediaType | safeHTML -}}
+
+  {{- with $.Paginator.Prev -}}
+    {{- $atomPrevious = printf `<atom:link rel="previous" href=%q />` .URL | safeHTML -}}
+  {{- end -}}
+
+  {{- with $.Paginator.Next -}}
+    {{- $atomNext = printf `<atom:link rel="next" href=%q />` .URL | safeHTML -}}
+  {{- end -}}
+{{- end -}}
+
+{{- printf `<?xml version="1.0" encoding="utf-8" standalone="yes"?>` | safeHTML }}
+{{ printf `<?xml-stylesheet href="/rss.xsl" type="text/xsl"?>` | safeHTML }}
 
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
@@ -66,8 +68,12 @@
       <link>{{ .Permalink }}</link>
     </image>
     <lastBuildDate>{{ $lastBuildDate }}</lastBuildDate>
-    {{ $atomLink }}
-    {{- range $pages }}
+
+    {{ $atomSelf }}
+    {{ $atomPrevious }}
+    {{ $atomNext }}
+
+    {{- range first $limit .Paginator.Pages }}
       {{ if and (not .Params.Unlisted) (not .ExpiryDate) }}
       <item>
         <title>{{ .Summary | htmlUnescape }}</title>