pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' into gcodeScripts

Browse source
This commit is contained in:
Gina Häußge 2014-10-30 12:24:00 +01:00
commit 4a364d730b
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/octoprint/users.py
View file

@ -7,6 +7,7 @@ __copyright__ = "Copyright (C) 2014 The OctoPrint Project - Released under terms
from flask.ext.login import UserMixin
from flask.ext.principal import Identity
from werkzeug.local import LocalProxy
import hashlib
import os
import yaml
@ -27,7 +28,9 @@ class UserManager(object):
def login_user(self, user):
self._cleanup_sessions()
if user is None:
if user is None \
or (isinstance(user, LocalProxy) and not isinstance(user._get_current_object(), User)) \
or (not isinstance(user, LocalProxy) and not isinstance(user, User)):
return None
if not isinstance(user, SessionUser):