mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-20 21:31:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Handle 404 thread safely

Browse Source 
Replaces hack that temporarily changes a global flag.

Fixes #955
Fixes #939
This commit is contained in:
bep
2015-03-07 15:18:00 +01:00
parent 851badcb7e
commit 602ceec06d
3 changed files with 87 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hugolib/site.go
View File

@@ -1268,8 +1268,6 @@ func (s *Site) RenderSitemap() error {
sitemapDefault := parseSitemap(viper.GetStringMap("Sitemap"))
optChanged := false
n := s.NewNode()
// Prepend homepage to the list of pages
@@ -1295,23 +1293,12 @@ func (s *Site) RenderSitemap() error {
}
}
// Force `UglyUrls` option to force `sitemap.xml` file name
switch s.PageTarget().(type) {
case *target.Filesystem:
s.PageTarget().(*target.PagePub).UglyUrls = true
optChanged = true
}
smLayouts := []string{"sitemap.xml", "_default/sitemap.xml", "_internal/_default/sitemap.xml"}
if err := s.renderAndWriteXML("sitemap", "sitemap.xml", n, s.appendThemeTemplates(smLayouts)...); err != nil {
return err
}
if optChanged {
s.PageTarget().(*target.PagePub).UglyUrls = viper.GetBool("UglyUrls")
}
return nil
}