fixed a problem with reset_password redirect loop
This commit is contained in:
@@ -1 +1 @@
|
|||||||
Version 2.0.9 (2012-09-19 00:03:03) stable
|
Version 2.0.9 (2012-09-19 23:04:04) stable
|
||||||
|
|||||||
+2
-2
@@ -1197,7 +1197,7 @@ class Auth(object):
|
|||||||
'reset_password','request_reset_password',
|
'reset_password','request_reset_password',
|
||||||
'change_password','profile','groups',
|
'change_password','profile','groups',
|
||||||
'impersonate','not_authorized'):
|
'impersonate','not_authorized'):
|
||||||
if len(request.args) >= 2:
|
if len(request.args) >= 2 and args[0]=='impersonate':
|
||||||
return getattr(self,args[0])(request.args[1])
|
return getattr(self,args[0])(request.args[1])
|
||||||
else:
|
else:
|
||||||
return getattr(self,args[0])()
|
return getattr(self,args[0])()
|
||||||
@@ -2445,7 +2445,7 @@ class Auth(object):
|
|||||||
session = current.session
|
session = current.session
|
||||||
|
|
||||||
if next is DEFAULT:
|
if next is DEFAULT:
|
||||||
next = self.settings.reset_password_next
|
next = self.next or self.settings.reset_password_next
|
||||||
try:
|
try:
|
||||||
key = request.vars.key or getarg(-1)
|
key = request.vars.key or getarg(-1)
|
||||||
t0 = int(key.split('-')[0])
|
t0 = int(key.split('-')[0])
|
||||||
|
|||||||
Reference in New Issue
Block a user