Allows 404 templates from themes/THEME directories.

diff --git a/hugolib/site.go b/hugolib/site.go
index 32c737415d92e534646badeaa1646d4e0bc6de7c..f3d9bc6aef19a5c9a2cbe8a2c10f29fe79f0d14a 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -738,13 +738,14 @@ func (s *Site) RenderHomePage() error {
                }
        }
 
-       if a := s.Tmpl.Lookup("404.html"); a != nil {
-               n.Url = helpers.Urlize("404.html")
-               n.Title = "404 Page not found"
-               n.Permalink = s.permalink("404.html")
-
-               layouts := []string{"404.html"}
-               return s.render(n, "404.html", s.appendThemeTemplates(layouts)...)
+       n.Url = helpers.Urlize("404.html")
+       n.Title = "404 Page not found"
+       n.Permalink = s.permalink("404.html")
+
+       nfLayouts := []string{"404.html"}
+       nfErr := s.render(n, "404.html", s.appendThemeTemplates(nfLayouts)...)
+       if nfErr != nil {
+               return nfErr
        }
 
        return nil