issue 593, thnaks hi21alt

2012-01-12 12:47:41 -06:00
parent 2e75450339
commit 921be56a42
2 changed files with 3 additions and 2 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-Version 1.99.4 (2012-01-12 12:45:12) stable
+Version 1.99.4 (2012-01-12 12:47:39) stable
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -1775,7 +1775,8 @@ class Auth(object):
            session.auth = Storage(
                user = user,
                last_visit = request.now,
-                expiration = self.settings.long_expiration,
+                expiration = request.vars.get("remember",False) and \
+                    self.settings.long_expiration or self.settings.expiration,
                remember = request.vars.has_key("remember"),
                hmac_key = web2py_uuid()
                )