Merge pull request #992 from btreecat/master

Fixed authentication using different login methods.
web2py · Jun 8, 2015 · 33f12d9 · 33f12d9
2 parents d0f1286 + 918fdf2
commit 33f12d9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/gluon/tools.py b/gluon/tools.py
@@ -2325,8 +2325,8 @@ def login_bare(self, username, password):
             # 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
-                    return username
+                    self.user = user
+                    return user
         return False
 
     def register_bare(self, **fields):