fixed issue 1582:Cannot login_bare in a web2py shell, thanks Alan

This commit is contained in:
mdipierro
2013-07-13 19:10:12 -05:00
parent 70f34e4532
commit 324b71c3af
2 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -1 +1 @@
Version 2.6.0-development+timestamp.2013.07.12.11.57.25
Version 2.6.0-development+timestamp.2013.07.13.19.09.25
+4 -3
View File
@@ -506,7 +506,7 @@ class Session(Storage):
#check if session is separate
separate = None
if response.session_id[2:3] == "/":
if response.session and response.session_id[2:3] == "/":
separate = lambda session_name: session_name[-2:]
self._unlock(response)
@@ -589,8 +589,9 @@ class Session(Storage):
response.session_db_unique_key = unique_key
rcookies = response.cookies
rcookies[response.session_id_name] = response.session_id
rcookies[response.session_id_name]['path'] = '/'
if response.session_id_name:
rcookies[response.session_id_name] = response.session_id
rcookies[response.session_id_name]['path'] = '/'
if clear_session:
self.clear()