Merge branch 'master' of github.com:snapframework/snap

Conflicts: src/Snap/Snaplet/Auth/Handlers.hs
snapframework · Oct 28, 2011 · 5165115 · 5165115
2 parents a35696c + b5028fd
commit 5165115
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/snap.cabal b/snap.cabal
@@ -47,9 +47,6 @@ Library
       Snap.Loader.Devel
 
   exposed-modules:
-    Data.RBAC.Checker,
-    Data.RBAC.Role,
-    Data.RBAC.Types,
     Snap,
     Snap.Loader.Prod
     Snap.Snaplet,
@@ -60,6 +57,9 @@ Library
     Snap.Snaplet.Session.Backends.CookieSession
 
   other-modules:
+    Data.RBAC.Checker,
+    Data.RBAC.Role,
+    Data.RBAC.Types,
     Data.RBAC.Internal.Role,
     Data.RBAC.Internal.RoleMap,
     Data.RBAC.Internal.Rule,
@@ -100,7 +100,7 @@ Library
     filepath                  >= 1.1     && < 1.3,
     hashable                  >= 1.1     && < 1.2,
     heist                     >= 0.6     && < 0.7,
-    logict                    >= 0.4.2   && < 0.5,
+    logict                    >= 0.4.2   && < 0.6,
     mtl                       >  2.0     && < 2.1,
     mwc-random                >= 0.8     && < 0.11,
     old-time                  >= 1.0     && < 1.1,

diff --git a/src/Snap/Snaplet/Auth/Handlers.hs b/src/Snap/Snaplet/Auth/Handlers.hs
@@ -433,5 +433,5 @@ withBackend
   -- ^ The function to run with the handler.
   -> Handler b (AuthManager v) a
 withBackend f = join $ do
-  (AuthManager back _ _ _ _ _ _ _) <- get
-  return $ f back
+  (AuthManager bckend _ _ _ _ _ _ _) <- get
+  return $ f bckend