hugolib: Only return RSSLink when RSS is available - hugo - [fork] hugo port for 9front
HTML git clone git@git.drkhsh.at/hugo.git
DIR Log
DIR Files
DIR Refs
DIR Submodules
DIR README
DIR LICENSE
---
DIR commit cc15864744210497325b69d8c3b4130c9c5156ac
DIR parent b7a672fd22794ea7c32a958739c6b12aba5dadf8
HTML Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Wed, 1 Mar 2017 12:30:41 +0100
hugolib: Only return RSSLink when RSS is available
Fixes #1302
Diffstat:
M hugolib/hugo_sites_build_test.go | 5 ++++-
M hugolib/page.go | 4 ++--
M hugolib/site.go | 4 +++-
M hugolib/taxonomy_test.go | 5 +++++
4 files changed, 14 insertions(+), 4 deletions(-)
---
DIR diff --git a/hugolib/hugo_sites_build_test.go b/hugolib/hugo_sites_build_test.go
@@ -6,9 +6,9 @@ import (
"strings"
"testing"
+ "html/template"
"os"
"path/filepath"
- "text/template"
//"github.com/fortytw2/leaktest"
"github.com/fsnotify/fsnotify"
@@ -370,6 +370,9 @@ func doTestMultiSitesBuild(t *testing.T, configTemplate, configSuffix string) {
require.Equal(t, "Home", enSite.Menus["main"].ByName()[0].Name)
require.Equal(t, "Heim", nnSite.Menus["main"].ByName()[0].Name)
+ // Issue #1302
+ require.Equal(t, template.URL(""), enSite.RegularPages[0].RSSLink)
+
// Issue #3108
next := enSite.RegularPages[0].Next
require.NotNil(t, next)
DIR diff --git a/hugolib/page.go b/hugolib/page.go
@@ -186,7 +186,7 @@ type Page struct {
Sitemap Sitemap
- RSSLink template.HTML
+ RSSLink template.URL
URLPath
permalink *url.URL
@@ -1670,7 +1670,7 @@ func (p *Page) Hugo() *HugoInfo {
return hugoInfo
}
-func (p *Page) RSSlink() template.HTML {
+func (p *Page) RSSlink() template.URL {
// TODO(bep) we cannot have two of these
// Remove in Hugo 0.20
helpers.Deprecated(".Page", "Use RSSlink", "RSSLink", true)
DIR diff --git a/hugolib/site.go b/hugolib/site.go
@@ -2087,7 +2087,9 @@ func (s *Site) newHomePage() *Page {
func (s *Site) setPageURLs(p *Page, in string) {
p.URLPath.URL = s.PathSpec.URLizeAndPrep(in)
p.URLPath.Permalink = s.Info.permalink(p.URLPath.URL)
- p.RSSLink = template.HTML(s.Info.permalink(in + ".xml"))
+ if p.Kind != KindPage && p.Kind != KindTaxonomyTerm {
+ p.RSSLink = template.URL(s.Info.permalink(in + ".xml"))
+ }
}
func (s *Site) newTaxonomyPage(plural, key string) *Page {
DIR diff --git a/hugolib/taxonomy_test.go b/hugolib/taxonomy_test.go
@@ -15,6 +15,7 @@ package hugolib
import (
"fmt"
+ "html/template"
"path/filepath"
"reflect"
"testing"
@@ -125,6 +126,10 @@ others:
s := h.Sites[0]
+ // Issue #1302
+ term := s.getPage(KindTaxonomyTerm, "others")
+ require.Equal(t, template.URL(""), term.RSSLink)
+
// Issue #3070 preserveTaxonomyNames
if preserveTaxonomyNames {
helloWorld := s.getPage(KindTaxonomy, "others", "Hello Hugo world")