From c765e6e228022a3785906de68c02a2c6dd15865b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 1 Mar 2017 15:49:19 +0100 Subject: [PATCH] Revert "Only do lookup by userid if session is None" This reverts commit f02fac20ed337c8a991e5529804e0bde294c889f. The commit turned out to nuke the "remember me" functionality. --- src/octoprint/users.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/octoprint/users.py b/src/octoprint/users.py index 1c6258cd..c5bb27d6 100644 --- a/src/octoprint/users.py +++ b/src/octoprint/users.py @@ -377,7 +377,7 @@ class FilebasedUserManager(UserManager): if user is not None: return user - if userid is not None and session is None: + if userid is not None: if userid not in self._users.keys(): return None return self._users[userid]