Merge 918fdf2 into 236fdcf

web2py · Jun 2, 2015 · efe314a · efe314a
2 parents 236fdcf + 918fdf2
commit efe314a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/gluon/tools.py b/gluon/tools.py
@@ -2323,8 +2323,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):