Bugfix regarding with URI escaping

[Rakka.git] / Rakka / Resource / Render.hs

diff --git a/Rakka/Resource/Render.hs b/Rakka/Resource/Render.hs
index 18a7dc59487dd646621324dc74f4e433894e424d..64c159e495c39fc2aae2b88dc67ba501370c0cfc 100644 (file)
--- a/Rakka/Resource/Render.hs
+++ b/Rakka/Resource/Render.hs
@@ -3,18 +3,19 @@ module Rakka.Resource.Render
     )
     where
 
     )
     where
 

+import qualified Codec.Binary.UTF8.String as UTF8

 import           Control.Arrow
 import           Control.Arrow.ArrowIO
 import           Control.Arrow.ArrowList
 import           Control.Monad.Trans
 import qualified Data.ByteString.Lazy as Lazy
 import           Network.HTTP.Lucu
 import           Control.Arrow
 import           Control.Arrow.ArrowIO
 import           Control.Arrow.ArrowList
 import           Control.Monad.Trans
 import qualified Data.ByteString.Lazy as Lazy
 import           Network.HTTP.Lucu

-import           Network.HTTP.Lucu.Utils

 import           OpenSSL.EVP.Base64
 import           Rakka.Environment
 import           Rakka.Page
 import           Rakka.Utils
 import           Rakka.Wiki.Engine
 import           OpenSSL.EVP.Base64
 import           Rakka.Environment
 import           Rakka.Page
 import           Rakka.Utils
 import           Rakka.Wiki.Engine

+import           System.FilePath.Posix

 import           Text.XML.HXT.Arrow.Namespace
 import           Text.XML.HXT.Arrow.WriteDocument
 import           Text.XML.HXT.Arrow.XmlArrow
 import           Text.XML.HXT.Arrow.Namespace
 import           Text.XML.HXT.Arrow.WriteDocument
 import           Text.XML.HXT.Arrow.XmlArrow


@@ -36,7 +37,7 @@ resRender env
       }
     where
       toPageName :: [String] -> PageName
       }
     where
       toPageName :: [String] -> PageName

-      toPageName = decodePageName . joinWith "/" 
+      toPageName = UTF8.decodeString . joinPath

 
 
 {-
 
 
 {-