Skip to content

Commit 36bd938

Browse files
committed
Merge branch 'dev-v2.11' of github.com:ckan/ckan into dev-v2.11
2 parents 23b13dd + 1d98534 commit 36bd938

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

ckan/views/user.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,8 +576,9 @@ def login() -> Union[Response, str]:
576576
user_obj = authenticator.ckan_authenticator(identity)
577577
if user_obj:
578578
next = request.args.get('next', request.args.get('came_from'))
579-
if hasattr(current_app.session_interface, 'regenerate'):
580-
current_app.session_interface.regenerate(session)
579+
regenerate = getattr(current_app.session_interface, 'regenerate', None)
580+
if regenerate is not None:
581+
regenerate(session)
581582
if _remember:
582583
from datetime import timedelta
583584
duration_time = timedelta(milliseconds=int(_remember))

0 commit comments

Comments
 (0)