From 85252f8ab8fcf45b29bec76d140ec5bc067e609f Mon Sep 17 00:00:00 2001 From: Jasper Van der Jeugt Date: Sat, 19 Mar 2011 11:31:02 +0100 Subject: Fix filepath-1.2 issue in toSiteRoot --- src/Hakyll/Web/Util/Url.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Hakyll/Web/Util/Url.hs b/src/Hakyll/Web/Util/Url.hs index a0702d8..7ab6717 100644 --- a/src/Hakyll/Web/Util/Url.hs +++ b/src/Hakyll/Web/Util/Url.hs @@ -25,9 +25,11 @@ toUrl url = '/' : url -- toSiteRoot :: String -> String toSiteRoot = emptyException . joinPath . map parent - . splitPath . takeDirectory . dropLeadingSlash + . filter relevant . splitPath . takeDirectory where parent = const ".." emptyException [] = "." emptyException x = x - dropLeadingSlash = dropWhile (== '/') + relevant "." = False + relevant "/" = False + relevant _ = True -- cgit v1.2.3