Merge pull request #992 from btreecat/master

Fixed authentication using different login methods.
2015-06-07 21:47:08 -05:00
parent d0f1286f03 918fdf2f0c
commit 33f12d91a5
1 changed files with 2 additions and 2 deletions
@@ -2325,8 +2325,8 @@ class Auth(object):
            # user not in database try other login methods
            for login_method in self.settings.login_methods:
                if login_method != self and login_method(username, password):
-                    self.user = username
+                    self.user = user
-                    return username
+                    return user
        return False
    def register_bare(self, **fields):