git.iko.soy/hakyll
on master help sign in
Merge pull request #243 from izzycecil/FIX_toSiteRoot
15a9b90Jasper Van der Jeugt
src/Hakyll/Web/Html.hs+1
compare with master
unifiedsplit
@@ -124,6 +124,7 @@ toSiteRoot = emptyException . joinPath . map parent
124 emptyException x = x
124 emptyException x = x
125 relevant "." = False
125 relevant "." = False
126 relevant "/" = False
126 relevant "/" = False
127+ relevant "./" = False
127 relevant _ = True
128 relevant _ = True
128
129
129
130
tests/Hakyll/Web/Html/Tests.hs+2
@@ -59,6 +59,8 @@ tests = testGroup "Hakyll.Web.Html.Tests" $ concat
59 , "." @=? toSiteRoot "index.html"
59 , "." @=? toSiteRoot "index.html"
60 , "." @=? toSiteRoot "/index.html"
60 , "." @=? toSiteRoot "/index.html"
61 , "../.." @=? toSiteRoot "foo/bar/qux"
61 , "../.." @=? toSiteRoot "foo/bar/qux"
62+ , ".." @=? toSiteRoot "./foo/bar.html"
63+ , ".." @=? toSiteRoot "/foo/./bar.html"
62 ]
64 ]
63
65
64 , fromAssertions "isExternal"
66 , fromAssertions "isExternal"