diff options
| author | Kato Kazuyoshi <kato.kazuyoshi@gmail.com> | 2015-10-16 20:45:49 -0700 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2015-11-23 17:41:29 +0100 |
| commit | 99acbb2eb273500596a0da5b51b490fefc0829c4 (patch) | |
| tree | a646365c82c408f5d6712028f9f34b5479b710c0 /hugolib | |
| parent | 5838420aa1f5dfb6aa73479caa60467cc27dee82 (diff) | |
Permalink on Node and Page should be of string
This change fixes #1384.
Diffstat (limited to 'hugolib')
| -rw-r--r-- | hugolib/node.go | 2 | ||||
| -rw-r--r-- | hugolib/site.go | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/hugolib/node.go b/hugolib/node.go index dcbf0d146..c335b72df 100644 --- a/hugolib/node.go +++ b/hugolib/node.go @@ -139,7 +139,7 @@ func (n *Node) RelRef(ref string) (string, error) { type URLPath struct { URL string - Permalink template.HTML + Permalink string Slug string Section string } diff --git a/hugolib/site.go b/hugolib/site.go index fdc615bf3..2e07091fb 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -889,7 +889,7 @@ func (s *Site) RenderAliases() error { if err != nil { return err } - if err := s.WriteDestAlias(a, template.HTML(plink)); err != nil { + if err := s.WriteDestAlias(a, plink); err != nil { return err } } @@ -1386,11 +1386,11 @@ func (s *Site) Stats() { func (s *Site) setURLs(n *Node, in string) { n.URL = helpers.URLizeAndPrep(in) n.Permalink = s.permalink(n.URL) - n.RSSLink = s.permalink(in + ".xml") + n.RSSLink = template.HTML(s.permalink(in + ".xml")) } -func (s *Site) permalink(plink string) template.HTML { - return template.HTML(s.permalinkStr(plink)) +func (s *Site) permalink(plink string) string { + return s.permalinkStr(plink) } func (s *Site) permalinkStr(plink string) string { @@ -1572,7 +1572,7 @@ func (s *Site) WriteDestPage(path string, reader io.Reader) (err error) { return s.PageTarget().Publish(path, reader) } -func (s *Site) WriteDestAlias(path string, permalink template.HTML) (err error) { +func (s *Site) WriteDestAlias(path string, permalink string) (err error) { jww.DEBUG.Println("creating alias:", path) return s.AliasTarget().Publish(path, permalink) } |