Minor changes

This commit is contained in:
Michael Snoyman 2010-04-25 11:05:59 -07:00
parent c320d2a45b
commit a6ab2db6a7
3 changed files with 3 additions and 2 deletions

View File

@ -186,7 +186,7 @@ runHandler handler mrender sroute tomr ma tosa = YesodApp $ \eh rr cts -> do
let handleError e = do let handleError e = do
(_, hs, ct, c) <- unYesodApp (eh e) safeEh rr cts (_, hs, ct, c) <- unYesodApp (eh e) safeEh rr cts
let hs' = headers ++ hs let hs' = headers ++ hs
return $ (getStatus e, hs', ct, c) return (getStatus e, hs', ct, c)
let sendFile' ct fp = do let sendFile' ct fp = do
c <- BL.readFile fp c <- BL.readFile fp
return (W.Status200, headers, ct, cs c) return (W.Status200, headers, ct, cs c)

View File

@ -74,7 +74,7 @@ getOpenIdR = do
(x:_) -> addCookie destCookieTimeout destCookieName x (x:_) -> addCookie destCookieTimeout destCookieName x
rtom <- getRouteToMaster rtom <- getRouteToMaster
let html = template (getParams rr "message", rtom) let html = template (getParams rr "message", rtom)
applyLayout "Log in via OpenID" $ html applyLayout "Log in via OpenID" html
where where
urlForward (_, wrapper) = wrapper OpenIdForward urlForward (_, wrapper) = wrapper OpenIdForward
hasMessage = not . null . fst hasMessage = not . null . fst

View File

@ -1,3 +1,4 @@
-- FIXME document
{-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE CPP #-} {-# LANGUAGE CPP #-}
module Yesod.Json module Yesod.Json