From 5bed76f067d07d0641f484f677dcb786b91e80ad Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 30 Jun 2010 21:19:24 +0300 Subject: [PATCH] redirect uses redirectParams --- Yesod/Handler.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Yesod/Handler.hs b/Yesod/Handler.hs index 69bc0fe4..7c714214 100644 --- a/Yesod/Handler.hs +++ b/Yesod/Handler.hs @@ -255,16 +255,15 @@ safeEh er = YesodApp $ \_ _ _ -> do -- | Redirect to the given route. redirect :: RedirectType -> Routes master -> GHandler sub master a -redirect rt url = do - r <- getUrlRender - redirectString rt $ r url +redirect rt url = redirectParams rt url [] -- | Redirects to the given route with the associated query-string parameters. redirectParams :: RedirectType -> Routes master -> [(String, String)] -> GHandler sub master a redirectParams rt url params = do r <- getUrlRender - redirectString rt $ r url ++ '?' : encodeUrlPairs params + redirectString rt $ r url ++ + if null params then "" else '?' : encodeUrlPairs params where encodeUrlPairs = intercalate "&" . map encodeUrlPair encodeUrlPair (x, []) = escape x