diff --git a/Yesod/Core/Class/Yesod.hs b/Yesod/Core/Class/Yesod.hs --- a/Yesod/Core/Class/Yesod.hs +++ b/Yesod/Core/Class/Yesod.hs @@ -94,7 +94,7 @@ defaultLayout w = do p <- widgetToPageContent w mmsg <- getMessage - giveUrlRenderer [hamlet| + withUrlRenderer [hamlet| $newline never $doctype 5 diff --git a/Yesod/Core/Handler.hs b/Yesod/Core/Handler.hs --- a/Yesod/Core/Handler.hs +++ b/Yesod/Core/Handler.hs @@ -139,6 +139,7 @@ -- ** Hamlet , hamletToRepHtml , giveUrlRenderer + , withUrlRenderer -- ** Misc , newIdent -- * Lifting @@ -854,7 +855,7 @@ -> m a redirectToPost url = do urlText <- toTextUrl url - giveUrlRenderer [hamlet| + withUrlRenderer [hamlet| $newline never $doctype 5 @@ -870,17 +871,26 @@ -- | Wraps the 'Content' generated by 'hamletToContent' in a 'RepHtml'. hamletToRepHtml :: MonadHandler m => HtmlUrl (Route (HandlerSite m)) -> m Html -hamletToRepHtml = giveUrlRenderer -{-# DEPRECATED hamletToRepHtml "Use giveUrlRenderer instead" #-} +hamletToRepHtml = withUrlRenderer +{-# DEPRECATED hamletToRepHtml "Use withUrlRenderer instead" #-} --- | Provide a URL rendering function to the given function and return the --- result. Useful for processing Shakespearean templates. +-- | Deprecated synonym for 'withUrlRenderer'. -- -- Since 1.2.0 giveUrlRenderer :: MonadHandler m => ((Route (HandlerSite m) -> [(Text, Text)] -> Text) -> output) -> m output -giveUrlRenderer f = do +giveUrlRenderer = withUrlRenderer +{-# DEPRECATED giveUrlRenderer "Use withUrlRenderer instead" #-} + +-- | Provide a URL rendering function to the given function and return the +-- result. Useful for processing Shakespearean templates. +-- +-- Since 1.2.20 +withUrlRenderer :: MonadHandler m + => ((Route (HandlerSite m) -> [(Text, Text)] -> Text) -> output) + -> m output +withUrlRenderer f = do render <- getUrlRenderParams return $ f render diff --git a/yesod-core.cabal b/yesod-core.cabal --- a/yesod-core.cabal +++ b/yesod-core.cabal @@ -1,5 +1,5 @@ name: yesod-core -version: 1.2.19.2 +version: 1.2.20 license: MIT license-file: LICENSE author: Michael Snoyman